On 03/10/2011 04:58 AM, Daniel P. Berrange wrote:
On Wed, Mar 09, 2011 at 06:45:42PM -0700, Eric Blake wrote:
> * src/qemu/qemu_monitor_text.h (qemuMonitorTextMigrate): Declare
> in place of individual monitor commands.
> * src/qemu/qemu_monitor_json.h (qemuMonitorJSONMigrate): Likewise.
> * src/qemu/qemu_monitor_text.c (qemuMonitorTextMigrateToHost)
> (qemuMonitorTextMigrateToCommand, qemuMonitorTextMigrateToFile)
> (qemuMonitorTextMigrateToUnix): Delete.
> * src/qemu/qemu_monitor_json.c (qemuMonitorJSONMigrateToHost)
> (qemuMonitorJSONMigrateToCommand, qemuMonitorJSONMigrateToFile)
> (qemuMonitorJSONMigrateToUnix): Delete.
> * src/qemu/qemu_monitor.c (qemuMonitorMigrateToHost)
> (qemuMonitorMigrateToCommand, qemuMonitorMigrateToFile)
> (qemuMonitorMigrateToUnix): Consolidate shared code.
> ---
> src/qemu/qemu_monitor.c | 92 +++++++++++++++++++++++++++----
> src/qemu/qemu_monitor_json.c | 125 +----------------------------------------
> src/qemu/qemu_monitor_json.h | 23 +------
> src/qemu/qemu_monitor_text.c | 123 +----------------------------------------
> src/qemu/qemu_monitor_text.h | 23 +------
> 5 files changed, 97 insertions(+), 289 deletions(-)
ACK
Thanks; I've pushed 1 and 2, and am still in the process of
incorporating review comments from the rest of the series and testing
that I haven't broken things with the changes. Also, gnulib just barely
learned sendfd/recvfd this weekend, and I'll have a go at seeing how
using those simplifies things.
--
Eric Blake eblake(a)redhat.com +1-801-349-2682
Libvirt virtualization library
http://libvirt.org