[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/19] Monitor: Convert do_info() back to HMP
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 06/19] Monitor: Convert do_info() back to HMP |
Date: |
Thu, 30 Sep 2010 17:56:07 -0300 |
This is a HMP specific handler, it makes no sense to have it
under QMP.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 5 ++---
qemu-monitor.hx | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/monitor.c b/monitor.c
index 5b57810..c22f5d6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -633,7 +633,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");
@@ -665,11 +665,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 49bcd8d..57d28ac 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
--
1.7.3.1.45.g9855b
- [Qemu-devel] [PATCH v2 00/19] Monitor: split HMP and QMP dispatch tables, Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 01/19] Monitor: Introduce search_dispatch_table(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 02/19] QMP: handle_qmp_command(): Move 'cmd' sanity check, Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 03/19] QMP: Don't use do_info(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 04/19] Monitor: Drop QMP bits from do_info(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 05/19] Monitor: Drop is_async_return(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 06/19] Monitor: Convert do_info() back to HMP,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 07/19] Monitor: Introduce the qmp-commands.hx file, Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 09/19] QMP: Introduce command dispatch table, Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 08/19] QMP: Introduce qmp_find_cmd(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 10/19] QMP: Introduce query commands dispatch table, Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 12/19] QMP: Small cleanup in handle_qmp_command(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 11/19] QMP: Simplify do_info_commands(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 14/19] Monitor: Drop monitor_cmd_user_only(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 13/19] Monitor: Drop QMP info from the qemu-monitor.hx file, Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 15/19] Monitor: Rename monitor_handler_ported(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 16/19] Monitor: Rename monitor_handler_is_async(), Luiz Capitulino, 2010/09/30