From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39478 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwKxJ-0000QL-98 for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OwKxH-0001NN-D9 for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35132) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OwKxH-0001NE-5s for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:15 -0400 From: Luiz Capitulino Date: Thu, 16 Sep 2010 17:20:48 -0300 Message-Id: <1284668464-15981-3-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 02/18] QMP: handle_qmp_command(): Move 'cmd' sanity check 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 Next commit will change how query commands are handled in a way that the 'cmd' sanity check is also going to be needed for query commands handling. Let's move it out of the else body then. Signed-off-by: Luiz Capitulino --- monitor.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 98fc57a..b2d8a2d 100644 --- a/monitor.c +++ b/monitor.c @@ -4372,11 +4372,11 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) qobject_from_jsonf("{ 'item': %s }", info_item)); } else { cmd = monitor_find_command(cmd_name); - if (!cmd || !monitor_handler_ported(cmd) - || monitor_cmd_user_only(cmd)) { - qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); - goto err_out; - } + } + + if (!cmd || !monitor_handler_ported(cmd) || monitor_cmd_user_only(cmd)) { + qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); + goto err_out; } obj = qdict_get(input, "arguments"); -- 1.7.3.rc2.dirty