OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qmp: Simplify recognition of capability negotiation command

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-01-13 16:14:04 +01:00
parent ad0ec14bad
commit bb5224edfb
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
monitor.c
View File

@ -4783,9 +4783,9 @@ static int monitor_can_read(void *opaque)
return (mon->suspend_cnt == 0) ? 1 : 0; return (mon->suspend_cnt == 0) ? 1 : 0;
} }
static int invalid_qmp_mode(const Monitor *mon, const char *cmd_name) static int invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd)
{ {
int is_cap = compare_cmd(cmd_name, "qmp_capabilities"); int is_cap = cmd->mhandler.cmd_new == do_qmp_capabilities;
return (qmp_cmd_mode(mon) ? is_cap : !is_cap); return (qmp_cmd_mode(mon) ? is_cap : !is_cap);
} }
@ -5079,13 +5079,8 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
cmd_name = qdict_get_str(input, "execute"); cmd_name = qdict_get_str(input, "execute");
trace_handle_qmp_command(mon, cmd_name); trace_handle_qmp_command(mon, cmd_name);
if (invalid_qmp_mode(mon, cmd_name)) {
qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
goto err_out;
}
cmd = qmp_find_cmd(cmd_name); cmd = qmp_find_cmd(cmd_name);
if (!cmd) { if (!cmd || invalid_qmp_mode(mon, cmd)) {
qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
goto err_out; goto err_out;
} }