aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-12-18 14:51:49 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-19 08:26:28 -0600
commitaac2ad563abadac1ae135714dba6149d419d7811 (patch)
treed9313a216596253aa2e9a4d3573236fb64a28780
parenteb41f58a4e971f630e37a1e10a25fa491e881430 (diff)
Revert "monitor: Convert do_migrate_set_speed() to QObject"
This reverts commit 3a4921047d514c336531c304bec362c4d138ebcc. From Luiz: do_migrate_set_speed() accepts a suffix for the 'value' argument and this is not good for QMP. We will have to add a new argument type to handle that and this will have to wait for 0.13. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 46ee2295678af629a2869e4e331e4e002bcc31fd)
-rw-r--r--migration.c2
-rw-r--r--migration.h2
-rw-r--r--qemu-monitor.hx3
3 files changed, 3 insertions, 4 deletions
diff --git a/migration.c b/migration.c
index fda61e6425..598f8df5c4 100644
--- a/migration.c
+++ b/migration.c
@@ -106,7 +106,7 @@ void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
s->cancel(s);
}
-void do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
+void do_migrate_set_speed(Monitor *mon, const QDict *qdict)
{
double d;
char *ptr;
diff --git a/migration.h b/migration.h
index 3ac208bf5e..cbd456b901 100644
--- a/migration.h
+++ b/migration.h
@@ -56,7 +56,7 @@ void do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data);
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);
+void do_migrate_set_speed(Monitor *mon, const QDict *qdict);
uint64_t migrate_max_downtime(void);
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index aac0f3e510..1aa78186ba 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -763,8 +763,7 @@ ETEXI
.args_type = "value:s",
.params = "value",
.help = "set maximum speed (in bytes) for migrations",
- .user_print = monitor_user_noop,
- .mhandler.cmd_new = do_migrate_set_speed,
+ .mhandler.cmd = do_migrate_set_speed,
},
STEXI