Patchwork [06/10] monitor: Convert do_migrate_cancel() to QObject

login
register
mail settings
Submitter Luiz Capitulino
Date Oct. 8, 2009, 9:35 p.m.
Message ID <1255037747-3340-7-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/35536/
State Under Review
Headers show

Comments

Luiz Capitulino - Oct. 8, 2009, 9:35 p.m.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 migration.c     |    5 ++++-
 migration.h     |    2 +-
 qemu-monitor.hx |    3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

Patch

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