From: Luiz Capitulino <lcapitulino@redhat.com>
Date: Fri, 16 Oct 2009 15:23:47 +0000 (-0300)
Subject: monitor: Convert do_migrate_cancel() to QObject
X-Git-Tag: v0.12.0-rc0~494
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=911d2963468d92f292594bc6dd0cae2b0b4f9c5a;p=thirdparty%2Fqemu.git

monitor: Convert do_migrate_cancel() to QObject

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/migration.c b/migration.c
index 9a40b37ca9e..b20beb73026 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 40bd610a324..2d28b8f395c 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 af1bae5850a..41fbfd374ee 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