summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2010-09-15 10:56:17 -0300
committerLuiz Capitulino <lcapitulino@redhat.com>2010-10-01 10:20:06 -0300
commit0fb88582e60e16e809c1aabc2c4b3e1f0832e267 (patch)
treebc3e9868eab32689cf68afa1e10987b299e035b5 /monitor.c
parent945c5ac8d3c792bab36dc0990f11ca55f6eb3148 (diff)
downloadqemu-0fb88582e60e16e809c1aabc2c4b3e1f0832e267.tar.gz
qemu-0fb88582e60e16e809c1aabc2c4b3e1f0832e267.tar.bz2
qemu-0fb88582e60e16e809c1aabc2c4b3e1f0832e267.zip
QMP: handle_qmp_command(): Move 'cmd' sanity check
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>
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/monitor.c b/monitor.c
index da76eab16a..2efff8ab24 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4375,11 +4375,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");