mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: Propagate errors through invalid_qmp_mode()

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Markus Armbruster 2015-05-29 10:27:16 +02:00
parent ba0510aad4
commit 4086182fcd
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
monitor.c
View File

@ -4708,19 +4708,20 @@ static int monitor_can_read(void *opaque)
return (mon->suspend_cnt == 0) ? 1 : 0; return (mon->suspend_cnt == 0) ? 1 : 0;
} }
static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd) static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd,
Error **errp)
{ {
bool is_cap = cmd->mhandler.cmd_new == do_qmp_capabilities; bool is_cap = cmd->mhandler.cmd_new == do_qmp_capabilities;
if (is_cap && qmp_cmd_mode(mon)) { if (is_cap && qmp_cmd_mode(mon)) {
qerror_report(ERROR_CLASS_COMMAND_NOT_FOUND, error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
"Capabilities negotiation is already complete, command " "Capabilities negotiation is already complete, command "
"'%s' ignored", cmd->name); "'%s' ignored", cmd->name);
return true; return true;
} }
if (!is_cap && !qmp_cmd_mode(mon)) { if (!is_cap && !qmp_cmd_mode(mon)) {
qerror_report(ERROR_CLASS_COMMAND_NOT_FOUND, error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
"Expecting capabilities negotiation with " "Expecting capabilities negotiation with "
"'qmp_capabilities' before command '%s'", cmd->name); "'qmp_capabilities' before command '%s'", cmd->name);
return true; return true;
} }
return false; return false;
@ -5010,7 +5011,8 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
"The command %s has not been found", cmd_name); "The command %s has not been found", cmd_name);
goto err_out; goto err_out;
} }
if (invalid_qmp_mode(mon, cmd)) { if (invalid_qmp_mode(mon, cmd, &local_err)) {
qerror_report_err(local_err);
goto err_out; goto err_out;
} }