From patchwork Thu Oct 8 21:35:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [04/10] monitor: Convert do_migrate() to QObject Date: Thu, 08 Oct 2009 11:35:41 -0000 From: Luiz Capitulino X-Patchwork-Id: 35534 Message-Id: <1255037747-3340-5-git-send-email-lcapitulino@redhat.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com Error is still directly printed, as we are only converting regular output. Signed-off-by: Luiz Capitulino --- migration.c | 5 ++++- migration.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/migration.c b/migration.c index 7f93e3f..4212f71 100644 --- a/migration.c +++ b/migration.c @@ -52,7 +52,10 @@ void qemu_start_incoming_migration(const char *uri) fprintf(stderr, "unknown migration protocol: %s\n", uri); } -void do_migrate(Monitor *mon, const QDict *qdict) +/** + * do_migrate(): Migrate the VM. + */ +void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) { MigrationState *s = NULL; const char *p; diff --git a/migration.h b/migration.h index 53b923d..17ca9ff 100644 --- a/migration.h +++ b/migration.h @@ -50,7 +50,7 @@ struct FdMigrationState void qemu_start_incoming_migration(const char *uri); -void do_migrate(Monitor *mon, const QDict *qdict); +void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data); void do_migrate_cancel(Monitor *mon, const QDict *qdict); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 1c605bd..8e7bfd4 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -726,7 +726,8 @@ ETEXI .args_type = "detach:-d,uri:s", .params = "[-d] uri", .help = "migrate to URI (using -d to not wait for completion)", - .mhandler.cmd = do_migrate, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_migrate, }, STEXI