diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2010-09-13 12:15:26 -0300 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2010-10-01 10:20:06 -0300 |
| commit | 1162daa6c163ca022165a9bcb3078c2e16f32674 (patch) | |
| tree | 144f5268cc039cb6b1abdc77ae17fed97374dede | |
| parent | d4551293d68a1876df87400be6c71c657756d0bb (diff) | |
| download | qemu-1162daa6c163ca022165a9bcb3078c2e16f32674.tar.gz | |
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 <lcapitulino@redhat.com>
| -rw-r--r-- | monitor.c | 5 | ||||
| -rw-r--r-- | qemu-monitor.hx | 3 |
2 files changed, 3 insertions, 5 deletions
@@ -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 |