From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49474 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1kE2-00066q-HS for qemu-devel@nongnu.org; Fri, 01 Oct 2010 14:21:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P1kDR-0003QU-95 for qemu-devel@nongnu.org; Fri, 01 Oct 2010 14:20:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P1kDQ-0003QK-TU for qemu-devel@nongnu.org; Fri, 01 Oct 2010 14:20:17 -0400 From: Luiz Capitulino Date: Fri, 1 Oct 2010 15:19:25 -0300 Message-Id: <1285957167-1228-22-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1285957167-1228-1-git-send-email-lcapitulino@redhat.com> References: <1285957167-1228-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 21/23] QMP: Introduce qmp_call_cmd() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: qemu-devel@nongnu.org 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 03f3c18..3f3c9bf 100644 --- a/monitor.c +++ b/monitor.c @@ -3880,29 +3880,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; @@ -4433,6 +4410,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; @@ -4500,7 +4491,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.50.g1e633