From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mw0es-0001Gy-Lq for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mw0el-00019X-D9 for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:21 -0400 Received: from [199.232.76.173] (port=34346 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mw0el-00019B-4Z for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59610) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mw0ek-0002zc-K3 for qemu-devel@nongnu.org; Thu, 08 Oct 2009 17:36:14 -0400 From: Luiz Capitulino Date: Thu, 8 Oct 2009 18:35:43 -0300 Message-Id: <1255037747-3340-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1255037747-3340-1-git-send-email-lcapitulino@redhat.com> References: <1255037747-3340-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 06/10] monitor: Convert do_migrate_cancel() to QObject List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 -- 1.6.5.rc2.17.gdbc1b