From patchwork Fri Dec 18 19:49:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [FOR,0.12] monitor: Revert do_migrate_set_speed() conversion Date: Fri, 18 Dec 2009 09:49:23 -0000 From: Luiz Capitulino X-Patchwork-Id: 41427 Message-Id: <20091218174923.450e2076@doriath> To: qemu-devel@nongnu.org Cc: aliguori@linux.vnet.ibm.com, armbru@redhat.com This reverts commit 3a4921. 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: Luiz Capitulino --- migration.c | 2 +- migration.h | 2 +- qemu-monitor.hx | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/migration.c b/migration.c index fda61e6..598f8df 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 3ac208b..cbd456b 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 aac0f3e..1aa7818 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