From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxGf9-0001Ty-Nw for qemu-devel@nongnu.org; Tue, 26 May 2015 11:21:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxGf5-0006in-0j for qemu-devel@nongnu.org; Tue, 26 May 2015 11:21:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxGf4-0006hg-PD for qemu-devel@nongnu.org; Tue, 26 May 2015 11:20:58 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4QFKwdI005578 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 26 May 2015 11:20:58 -0400 From: Markus Armbruster Date: Tue, 26 May 2015 17:20:37 +0200 Message-Id: <1432653655-30745-3-git-send-email-armbru@redhat.com> In-Reply-To: <1432653655-30745-1-git-send-email-armbru@redhat.com> References: <1432653655-30745-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 02/20] monitor: Clean up after previous commit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Inline qmp_call_cmd() along with its helper handler_audit() into its only caller handle_qmp_command(), and simplify the result. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- monitor.c | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/monitor.c b/monitor.c index 27efeb6..416ba10 100644 --- a/monitor.c +++ b/monitor.c @@ -4045,18 +4045,6 @@ void monitor_set_error(Monitor *mon, QError *qerror) } } -static void handler_audit(Monitor *mon, const mon_cmd_t *cmd, int ret) -{ - if (ret && !monitor_has_error(mon)) { - /* - * If it returns failure, it must have passed on error. - * - * Action: Report an internal error to the client if in QMP. - */ - qerror_report(QERR_UNDEFINED_ERROR); - } -} - static void handle_user_command(Monitor *mon, const char *cmdline) { QDict *qdict; @@ -5013,28 +5001,17 @@ static QDict *qmp_check_input_obj(QObject *input_obj) return input_dict; } -static void qmp_call_cmd(Monitor *mon, const mon_cmd_t *cmd, - const QDict *params) -{ - int ret; - QObject *data = NULL; - - 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; - QObject *obj; + QObject *obj, *data; QDict *input, *args; const mon_cmd_t *cmd; const char *cmd_name; Monitor *mon = cur_mon; args = input = NULL; + data = NULL; obj = json_parser_parse(tokens, NULL); if (!obj) { @@ -5077,12 +5054,17 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) goto err_out; } - qmp_call_cmd(mon, cmd, args); - goto out; + if (cmd->mhandler.cmd_new(mon, args, &data)) { + /* Command failed... */ + if (!monitor_has_error(mon)) { + /* ... without setting an error, so make one up */ + qerror_report(QERR_UNDEFINED_ERROR); + } + } err_out: - monitor_protocol_emitter(mon, NULL); -out: + monitor_protocol_emitter(mon, data); + qobject_decref(data); QDECREF(input); QDECREF(args); } -- 1.9.3