From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39740 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwKxq-0000m1-0Y for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OwKxo-0001VW-NG for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34855) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OwKxo-0001VK-H4 for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:48 -0400 From: Luiz Capitulino Date: Thu, 16 Sep 2010 17:21:04 -0300 Message-Id: <1284668464-15981-19-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> References: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 18/18] QMP: Introduce qmp_call_cmd() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, armbru@redhat.com Calls a QObject handler and emits the QMP response, also drops monitor_call_handler() which is now unused. Signed-off-by: Luiz Capitulino --- monitor.c | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 deletions(-) diff --git a/monitor.c b/monitor.c index c332e06..1da65ab 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.rc2.dirty