[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/19] QMP: Introduce qmp_call_cmd()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 18/19] QMP: Introduce qmp_call_cmd() |
Date: |
Thu, 30 Sep 2010 17:56:19 -0300 |
Calls a QObject handler and emits the QMP response, also drops
monitor_call_handler() which is now unused.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/monitor.c b/monitor.c
index adc5bbd..d4ac81a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3877,29 +3877,6 @@ static void handler_audit(Monitor *mon, const mon_cmd_t
*cmd, int ret)
}
}
-static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd,
- const QDict *params)
-{
- int ret;
- QObject *data = NULL;
-
- mon_print_count_init(mon);
-
- ret = cmd->mhandler.cmd_new(mon, params, &data);
- handler_audit(mon, cmd, ret);
-
- if (monitor_ctrl_mode(mon)) {
- /* Monitor Protocol */
- monitor_protocol_emitter(mon, data);
- } else {
- /* User Protocol */
- if (data)
- cmd->user_print(mon, data);
- }
-
- qobject_decref(data);
-}
-
static void handle_user_command(Monitor *mon, const char *cmdline)
{
QDict *qdict;
@@ -4430,6 +4407,20 @@ static void qmp_call_query_cmd(Monitor *mon, const
mon_cmd_t *cmd)
}
}
+static void qmp_call_cmd(Monitor *mon, const mon_cmd_t *cmd,
+ const QDict *params)
+{
+ int ret;
+ QObject *data = NULL;
+
+ mon_print_count_init(mon);
+
+ ret = cmd->mhandler.cmd_new(mon, params, &data);
+ handler_audit(mon, cmd, ret);
+ monitor_protocol_emitter(mon, data);
+ qobject_decref(data);
+}
+
static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
{
int err;
@@ -4497,7 +4488,7 @@ static void handle_qmp_command(JSONMessageParser *parser,
QList *tokens)
goto err_out;
}
} else {
- monitor_call_handler(mon, cmd, args);
+ qmp_call_cmd(mon, cmd, args);
}
goto out;
--
1.7.3.1.45.g9855b
- [Qemu-devel] [PATCH 09/19] QMP: Introduce command dispatch table, (continued)
- [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, 2010/09/30
- [Qemu-devel] [PATCH 18/19] QMP: Introduce qmp_call_cmd(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 19/19] Monitor: Rename the qemu-monitor.hx file, Luiz Capitulino, 2010/09/30