summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2009-10-16 12:23:45 -0300
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-27 12:28:57 -0500
commit5f79da0037497aaa43ca82574b0c4e034010b871 (patch)
tree370664cc35bf661b676296eb447d68d3cabbeee5
parentmonitor: Convert do_physical_memory_save() to QObject (diff)
downloadqemu-kvm-5f79da0037497aaa43ca82574b0c4e034010b871.tar.gz
qemu-kvm-5f79da0037497aaa43ca82574b0c4e034010b871.tar.bz2
qemu-kvm-5f79da0037497aaa43ca82574b0c4e034010b871.zip
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>
-rw-r--r--migration.c2
-rw-r--r--migration.h2
-rw-r--r--qemu-monitor.hx3
3 files changed, 4 insertions, 3 deletions
diff --git a/migration.c b/migration.c
index 7f93e3fcd..fb37d1bd6 100644
--- 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 53b923d4b..17ca9ff14 100644
--- 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 1c605bd84..8e7bfd4b4 100644
--- 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