From 1162daa6c163ca022165a9bcb3078c2e16f32674 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 13 Sep 2010 12:15:26 -0300 Subject: [PATCH] Monitor: Convert do_info() back to HMP This is a HMP specific handler, it makes no sense to have it under QMP. Signed-off-by: Luiz Capitulino --- monitor.c | 5 ++--- qemu-monitor.hx | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 7f2af4942c..f0854c436f 100644 --- a/monitor.c +++ b/monitor.c @@ -636,7 +636,7 @@ static void user_async_info_handler(Monitor *mon, const mon_cmd_t *cmd) } } -static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) +static void do_info(Monitor *mon, const QDict *qdict) { const mon_cmd_t *cmd; const char *item = qdict_get_try_str(qdict, "item"); @@ -668,11 +668,10 @@ static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) cmd->mhandler.info(mon); } - return 0; + return; help: help_cmd(mon, "info"); - return 0; } static void do_info_version_print(Monitor *mon, const QObject *data) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 49bcd8d324..57d28ac1f1 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1654,8 +1654,7 @@ EQMP .args_type = "item:s?", .params = "[subcommand]", .help = "show various information about the system state", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_info, + .mhandler.cmd = do_info, }, STEXI