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

monitor: Propagate errors through qmp_check_input_obj()

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Markus Armbruster 2015-03-02 18:41:43 +01:00
parent 326283aa5d
commit ba0510aad4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
monitor.c
View File

@ -4929,14 +4929,14 @@ out:
* 5. If the "id" key exists, it can be anything (ie. json-value) * 5. If the "id" key exists, it can be anything (ie. json-value)
* 6. Any argument not listed above is considered invalid * 6. Any argument not listed above is considered invalid
*/ */
static QDict *qmp_check_input_obj(QObject *input_obj) static QDict *qmp_check_input_obj(QObject *input_obj, Error **errp)
{ {
const QDictEntry *ent; const QDictEntry *ent;
int has_exec_key = 0; int has_exec_key = 0;
QDict *input_dict; QDict *input_dict;
if (qobject_type(input_obj) != QTYPE_QDICT) { if (qobject_type(input_obj) != QTYPE_QDICT) {
qerror_report(QERR_QMP_BAD_INPUT_OBJECT, "object"); error_set(errp, QERR_QMP_BAD_INPUT_OBJECT, "object");
return NULL; return NULL;
} }
@ -4948,25 +4948,25 @@ static QDict *qmp_check_input_obj(QObject *input_obj)
if (!strcmp(arg_name, "execute")) { if (!strcmp(arg_name, "execute")) {
if (qobject_type(arg_obj) != QTYPE_QSTRING) { if (qobject_type(arg_obj) != QTYPE_QSTRING) {
qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute", error_set(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER,
"string"); "execute", "string");
return NULL; return NULL;
} }
has_exec_key = 1; has_exec_key = 1;
} else if (!strcmp(arg_name, "arguments")) { } else if (!strcmp(arg_name, "arguments")) {
if (qobject_type(arg_obj) != QTYPE_QDICT) { if (qobject_type(arg_obj) != QTYPE_QDICT) {
qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "arguments", error_set(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER,
"object"); "arguments", "object");
return NULL; return NULL;
} }
} else { } else {
qerror_report(QERR_QMP_EXTRA_MEMBER, arg_name); error_set(errp, QERR_QMP_EXTRA_MEMBER, arg_name);
return NULL; return NULL;
} }
} }
if (!has_exec_key) { if (!has_exec_key) {
qerror_report(QERR_QMP_BAD_INPUT_OBJECT, "execute"); error_set(errp, QERR_QMP_BAD_INPUT_OBJECT, "execute");
return NULL; return NULL;
} }
@ -4992,8 +4992,9 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
goto err_out; goto err_out;
} }
input = qmp_check_input_obj(obj); input = qmp_check_input_obj(obj, &local_err);
if (!input) { if (!input) {
qerror_report_err(local_err);
qobject_decref(obj); qobject_decref(obj);
goto err_out; goto err_out;
} }