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)

diff --git a/migration.c b/migration.c
index fda61e6425d8406fa29a35128d77981e603a0a97..598f8df5c4cfe4cd3c00f33862574baaaf514efd 100644 (file)
--- 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 3ac208bf5eb0d4de966118b33bbe6804b04805fd..cbd456b901f73f29a1add89f825b8c5713a820ec 100644 (file)
--- 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 aac0f3e510fe527df1805aa290fcafa7455774fb..1aa78186baf409aa66bcb6cbc217481c3f38aaaa 100644 (file)
--- 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