ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qmp: Improve QMP dispatch error messages 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1493282486-28338-2-git-send-email-armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Markus Armbruster 2017-04-27 10:41:23 +02:00
parent 0c099fa7e9
commit 10e37839ed
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qapi/qmp-dispatch.c
View File

@ -30,7 +30,7 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
dict = qobject_to_qdict(request); dict = qobject_to_qdict(request);
if (!dict) { if (!dict) {
error_setg(errp, "Expected '%s' in QMP input", "object"); error_setg(errp, "QMP input must be a JSON object");
return NULL; return NULL;
} }
@ -41,26 +41,26 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
if (!strcmp(arg_name, "execute")) { if (!strcmp(arg_name, "execute")) {
if (qobject_type(arg_obj) != QTYPE_QSTRING) { if (qobject_type(arg_obj) != QTYPE_QSTRING) {
error_setg(errp, "QMP input object member '%s' expects '%s'", error_setg(errp,
"execute", "string"); "QMP input member 'execute' must be a string");
return NULL; return NULL;
} }
has_exec_key = true; has_exec_key = true;
} 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) {
error_setg(errp, "QMP input object member '%s' expects '%s'", error_setg(errp,
"arguments", "object"); "QMP input member 'arguments' must be an object");
return NULL; return NULL;
} }
} else { } else {
error_setg(errp, "QMP input object member '%s' is unexpected", error_setg(errp, "QMP input member '%s' is unexpected",
arg_name); arg_name);
return NULL; return NULL;
} }
} }
if (!has_exec_key) { if (!has_exec_key) {
error_setg(errp, "Expected '%s' in QMP input", "execute"); error_setg(errp, "QMP input lacks member 'execute'");
return NULL; return NULL;
} }