From patchwork Thu Sep 16 20:20:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 64999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by ozlabs.org (Postfix) with ESMTP id B588D1007D2 for ; Fri, 17 Sep 2010 06:43:14 +1000 (EST) Received: from localhost ([127.0.0.1]:57333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwL4P-0004UC-7h for incoming@patchwork.ozlabs.org; Thu, 16 Sep 2010 16:28:37 -0400 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 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8GKLEDA027653 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Sep 2010 16:21:14 -0400 Received: from localhost ([10.3.113.6]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8GKLDnZ031733; Thu, 16 Sep 2010 16:21:14 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 02/18] QMP: handle_qmp_command(): Move 'cmd' sanity check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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");