sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

QMP: handle_qmp_command(): Small cleanup 

Drop a unneeded label and QDECREF() call.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Luiz Capitulino 2010-06-24 17:58:20 -03:00
parent 0bbab46db6
commit e4940c603a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
monitor.c
View File

@ -4234,7 +4234,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
Monitor *mon = cur_mon; Monitor *mon = cur_mon;
const char *cmd_name, *info_item; const char *cmd_name, *info_item;
args = NULL; args = input = NULL;
obj = json_parser_parse(tokens, NULL); obj = json_parser_parse(tokens, NULL);
if (!obj) { if (!obj) {
@ -4255,7 +4255,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
cmd_name = qdict_get_str(input, "execute"); cmd_name = qdict_get_str(input, "execute");
if (invalid_qmp_mode(mon, cmd_name)) { if (invalid_qmp_mode(mon, cmd_name)) {
qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
goto err_input; goto err_out;
} }
/* /*
@ -4264,7 +4264,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
*/ */
if (compare_cmd(cmd_name, "info")) { if (compare_cmd(cmd_name, "info")) {
qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
goto err_input; goto err_out;
} else if (strstart(cmd_name, "query-", &info_item)) { } else if (strstart(cmd_name, "query-", &info_item)) {
cmd = monitor_find_command("info"); cmd = monitor_find_command("info");
qdict_put_obj(input, "arguments", qdict_put_obj(input, "arguments",
@ -4273,7 +4273,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
cmd = monitor_find_command(cmd_name); cmd = monitor_find_command(cmd_name);
if (!cmd || !monitor_handler_ported(cmd)) { if (!cmd || !monitor_handler_ported(cmd)) {
qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
goto err_input; goto err_out;
} }
} }
@ -4285,8 +4285,6 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
QINCREF(args); QINCREF(args);
} }
QDECREF(input);
err = qmp_check_client_args(cmd, args); err = qmp_check_client_args(cmd, args);
if (err < 0) { if (err < 0) {
goto err_out; goto err_out;
@ -4301,13 +4299,13 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
} else { } else {
monitor_call_handler(mon, cmd, args); monitor_call_handler(mon, cmd, args);
} }
goto out; goto out;
err_input:
QDECREF(input);
err_out: err_out:
monitor_protocol_emitter(mon, NULL); monitor_protocol_emitter(mon, NULL);
out: out:
QDECREF(input);
QDECREF(args); QDECREF(args);
} }