From 911d2963468d92f292594bc6dd0cae2b0b4f9c5a Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Fri, 16 Oct 2009 12:23:47 -0300 Subject: [PATCH] monitor: Convert do_migrate_cancel() to QObject Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori --- migration.c | 2 +- migration.h | 2 +- qemu-monitor.hx | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/migration.c b/migration.c index 9a40b37ca9..b20beb7302 100644 --- a/migration.c +++ b/migration.c @@ -82,7 +82,7 @@ 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) { MigrationState *s = current_migration; diff --git a/migration.h b/migration.h index 40bd610a32..2d28b8f395 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 af1bae5850..41fbfd374e 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 -- GitLab