aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2009-10-16 12:23:47 -0300
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-27 12:28:57 -0500
commit911d2963468d92f292594bc6dd0cae2b0b4f9c5a (patch)
treeff27d348560e32fae3fbd84c17d1de37bc1ce90a
parent3a4921047d514c336531c304bec362c4d138ebcc (diff)
monitor: Convert do_migrate_cancel() to QObject
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 9a40b37ca..b20beb730 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 40bd610a3..2d28b8f39 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 af1bae585..41fbfd374 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