[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/23] Monitor: Drop QMP bits from do_info()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 07/23] Monitor: Drop QMP bits from do_info() |
Date: |
Fri, 1 Oct 2010 15:19:11 -0300 |
As of last commit, QMP doesn't use do_info() anymore. Simplify it.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 39 ++++++++-------------------------------
1 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/monitor.c b/monitor.c
index ff65f38..4fc0ad3 100644
--- a/monitor.c
+++ b/monitor.c
@@ -642,7 +642,6 @@ static int do_info(Monitor *mon, const QDict *qdict,
QObject **ret_data)
const char *item = qdict_get_try_str(qdict, "item");
if (!item) {
- assert(monitor_ctrl_mode(mon) == 0);
goto help;
}
@@ -652,24 +651,11 @@ static int do_info(Monitor *mon, const QDict *qdict,
QObject **ret_data)
}
if (cmd->name == NULL) {
- if (monitor_ctrl_mode(mon)) {
- qerror_report(QERR_COMMAND_NOT_FOUND, item);
- return -1;
- }
goto help;
}
- if (monitor_ctrl_mode(mon) && monitor_cmd_user_only(cmd)) {
- qerror_report(QERR_COMMAND_NOT_FOUND, item);
- return -1;
- }
-
if (monitor_handler_is_async(cmd)) {
- if (monitor_ctrl_mode(mon)) {
- qmp_async_info_handler(mon, cmd);
- } else {
- user_async_info_handler(mon, cmd);
- }
+ user_async_info_handler(mon, cmd);
/*
* Indicate that this command is asynchronous and will not return any
* data (not even empty). Instead, the data will be returned via a
@@ -677,24 +663,15 @@ static int do_info(Monitor *mon, const QDict *qdict,
QObject **ret_data)
*/
*ret_data = qobject_from_jsonf("{ '__mon_async': 'return' }");
} else if (monitor_handler_ported(cmd)) {
- cmd->mhandler.info_new(mon, ret_data);
+ QObject *info_data = NULL;
- if (!monitor_ctrl_mode(mon)) {
- /*
- * User Protocol function is called here, Monitor Protocol is
- * handled by monitor_call_handler()
- */
- if (*ret_data)
- cmd->user_print(mon, *ret_data);
+ cmd->mhandler.info_new(mon, &info_data);
+ if (info_data) {
+ cmd->user_print(mon, info_data);
+ qobject_decref(info_data);
}
} else {
- if (monitor_ctrl_mode(mon)) {
- /* handler not converted yet */
- qerror_report(QERR_COMMAND_NOT_FOUND, item);
- return -1;
- } else {
- cmd->mhandler.info(mon);
- }
+ cmd->mhandler.info(mon);
}
return 0;
--
1.7.3.1.50.g1e633
- [Qemu-devel] [PULL 00/23]: Monitor queue, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 01/23] Add support for JSON pretty printing, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 02/23] Add option to turn on JSON pretty printing in monitor, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 03/23] disable guest-provided stats on "info balloon" command, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 04/23] Monitor: Introduce search_dispatch_table(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 05/23] QMP: handle_qmp_command(): Move 'cmd' sanity check, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 06/23] QMP: Don't use do_info(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 08/23] Monitor: Drop is_async_return(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 07/23] Monitor: Drop QMP bits from do_info(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 09/23] Monitor: Convert do_info() back to HMP, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 10/23] Monitor: Introduce the qmp-commands.hx file, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 11/23] QMP: Introduce qmp_find_cmd(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 12/23] QMP: Introduce command dispatch table, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 13/23] QMP: Introduce query commands dispatch table, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 14/23] QMP: Simplify do_info_commands(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 15/23] QMP: Small cleanup in handle_qmp_command(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 17/23] Monitor: Drop monitor_cmd_user_only(), Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 16/23] Monitor: Drop QMP info from the qemu-monitor.hx file, Luiz Capitulino, 2010/10/01
- [Qemu-devel] [PATCH 20/23] Monitor: Directly call QObject handlers, Luiz Capitulino, 2010/10/01