From patchwork Thu Oct 8 21:35:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [06/10] monitor: Convert do_migrate_cancel() to QObject Date: Thu, 08 Oct 2009 11:35:43 -0000 From: Luiz Capitulino X-Patchwork-Id: 35536 Message-Id: <1255037747-3340-7-git-send-email-lcapitulino@redhat.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com 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 c2baeea..112a5b6 100644 --- a/migration.c +++ b/migration.c @@ -85,7 +85,10 @@ void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) } } -void do_migrate_cancel(Monitor *mon, const QDict *qdict) +/** + * do_migrate_cancel(): Cancel the current VM migration. + */ +void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data) { MigrationState *s = current_migration; diff --git a/migration.h b/migration.h index 40bd610..2d28b8f 100644 --- a/migration.h +++ b/migration.h @@ -52,7 +52,7 @@ void qemu_start_incoming_migration(const char *uri); void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data); -void do_migrate_cancel(Monitor *mon, const QDict *qdict); +void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data); void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index af1bae5..41fbfd3 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -740,7 +740,8 @@ ETEXI .args_type = "", .params = "", .help = "cancel the current VM migration", - .mhandler.cmd = do_migrate_cancel, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_migrate_cancel, }, STEXI