[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/19] Monitor: Directly call QObject handlers
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 17/19] Monitor: Directly call QObject handlers |
Date: |
Thu, 30 Sep 2010 17:56:18 -0300 |
This avoids handle_user_command() calling monitor_call_handler(),
which is currently shared with QMP.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/monitor.c b/monitor.c
index a48f919..adc5bbd 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3914,7 +3914,15 @@ static void handle_user_command(Monitor *mon, const char
*cmdline)
if (handler_is_async(cmd)) {
user_async_cmd_handler(mon, cmd, qdict);
} else if (handler_is_qobject(cmd)) {
- monitor_call_handler(mon, cmd, qdict);
+ QObject *data = NULL;
+
+ /* XXX: ignores the error code */
+ cmd->mhandler.cmd_new(mon, qdict, &data);
+ assert(!monitor_has_error(mon));
+ if (data) {
+ cmd->user_print(mon, data);
+ qobject_decref(data);
+ }
} else {
cmd->mhandler.cmd(mon, qdict);
}
--
1.7.3.1.45.g9855b
- [Qemu-devel] [PATCH 07/19] Monitor: Introduce the qmp-commands.hx file, (continued)
- [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
- [Qemu-devel] [PATCH 17/19] Monitor: Directly call QObject handlers,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 18/19] QMP: Introduce qmp_call_cmd(), Luiz Capitulino, 2010/09/30
- [Qemu-devel] [PATCH 19/19] Monitor: Rename the qemu-monitor.hx file, Luiz Capitulino, 2010/09/30