monitor: Convert do_migrate() to QObject

Error is still directly printed, as we are only converting
regular output.

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 7f93e3fcdd52367a39f44ec427eee95fd880e3c2..fb37d1bd65de30a227a4ebfd36f8be1a9fee80eb 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -52,7 +52,7 @@ void qemu_start_incoming_migration(const char *uri)
         fprintf(stderr, "unknown migration protocol: %s\n", uri);
 }
 
-void do_migrate(Monitor *mon, const QDict *qdict)
+void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     MigrationState *s = NULL;
     const char *p;

diff --git a/migration.h b/migration.h
index 53b923d4b46d3225887b2ea1cd3feea6725afa12..17ca9ff149cb47d3795ebc37fe3b7ac220fd0a68 100644 (file)
--- a/migration.h
+++ b/migration.h
@@ -50,7 +50,7 @@ struct FdMigrationState
 
 void qemu_start_incoming_migration(const char *uri);
 
-void do_migrate(Monitor *mon, const QDict *qdict);
+void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
 void do_migrate_cancel(Monitor *mon, const QDict *qdict);
 

diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 1c605bd84b5701a829b8a55820d6eddb27337494..8e7bfd4b446a624c5002219af7c74aa227625266 100644 (file)
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -726,7 +726,8 @@ ETEXI
         .args_type  = "detach:-d,uri:s",
         .params     = "[-d] uri",
         .help       = "migrate to URI (using -d to not wait for completion)",
-        .mhandler.cmd = do_migrate,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_migrate,
     },
 
 STEXI