qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH 02/19] QMP: handle_qmp_command(): Move 'cmd' sanity check
Date: Thu, 30 Sep 2010 17:56:03 -0300	[thread overview]
Message-ID: <1285880180-29724-3-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1285880180-29724-1-git-send-email-lcapitulino@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 <lcapitulino@redhat.com>
---
 monitor.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/monitor.c b/monitor.c
index 5aead4f..8324e65 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.1.45.g9855b

  parent reply	other threads:[~2010-09-30 20:56 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-30 20:56 [Qemu-devel] [PATCH v2 00/19] Monitor: split HMP and QMP dispatch tables Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 01/19] Monitor: Introduce search_dispatch_table() Luiz Capitulino
2010-09-30 20:56 ` Luiz Capitulino [this message]
2010-09-30 20:56 ` [Qemu-devel] [PATCH 03/19] QMP: Don't use do_info() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 04/19] Monitor: Drop QMP bits from do_info() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 05/19] Monitor: Drop is_async_return() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 06/19] Monitor: Convert do_info() back to HMP Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 07/19] Monitor: Introduce the qmp-commands.hx file Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 08/19] QMP: Introduce qmp_find_cmd() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 09/19] QMP: Introduce command dispatch table Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 10/19] QMP: Introduce query commands " Luiz Capitulino
2010-10-01 13:31   ` [Qemu-devel] " Anthony Liguori
2010-10-01 13:49     ` Luiz Capitulino
2010-10-01 14:25       ` Anthony Liguori
2010-09-30 20:56 ` [Qemu-devel] [PATCH 11/19] QMP: Simplify do_info_commands() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 12/19] QMP: Small cleanup in handle_qmp_command() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 13/19] Monitor: Drop QMP info from the qemu-monitor.hx file Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 14/19] Monitor: Drop monitor_cmd_user_only() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 15/19] Monitor: Rename monitor_handler_ported() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 16/19] Monitor: Rename monitor_handler_is_async() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 17/19] Monitor: Directly call QObject handlers Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 18/19] QMP: Introduce qmp_call_cmd() Luiz Capitulino
2010-09-30 20:56 ` [Qemu-devel] [PATCH 19/19] Monitor: Rename the qemu-monitor.hx file Luiz Capitulino
2010-10-01  7:15 ` [Qemu-devel] [PATCH v2 00/19] Monitor: split HMP and QMP dispatch tables Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1285880180-29724-3-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=aliguori@us.ibm.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).