[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/28] qmp: Improve QMP dispatch error messages
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 20/28] qmp: Improve QMP dispatch error messages |
Date: |
Thu, 4 May 2017 17:23:57 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
qapi/qmp-dispatch.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index dc50212..5ad36f8 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -30,7 +30,7 @@ static QDict *qmp_dispatch_check_obj(const QObject *request,
Error **errp)
dict = qobject_to_qdict(request);
if (!dict) {
- error_setg(errp, "Expected '%s' in QMP input", "object");
+ error_setg(errp, "QMP input must be a JSON object");
return NULL;
}
@@ -41,26 +41,26 @@ static QDict *qmp_dispatch_check_obj(const QObject
*request, Error **errp)
if (!strcmp(arg_name, "execute")) {
if (qobject_type(arg_obj) != QTYPE_QSTRING) {
- error_setg(errp, "QMP input object member '%s' expects '%s'",
- "execute", "string");
+ error_setg(errp,
+ "QMP input member 'execute' must be a string");
return NULL;
}
has_exec_key = true;
} else if (!strcmp(arg_name, "arguments")) {
if (qobject_type(arg_obj) != QTYPE_QDICT) {
- error_setg(errp, "QMP input object member '%s' expects '%s'",
- "arguments", "object");
+ error_setg(errp,
+ "QMP input member 'arguments' must be an object");
return NULL;
}
} else {
- error_setg(errp, "QMP input object member '%s' is unexpected",
+ error_setg(errp, "QMP input member '%s' is unexpected",
arg_name);
return NULL;
}
}
if (!has_exec_key) {
- error_setg(errp, "Expected '%s' in QMP input", "execute");
+ error_setg(errp, "QMP input lacks member 'execute'");
return NULL;
}
--
2.7.4
- [Qemu-devel] [PULL 03/28] pci: Use struct instead of QDict to pass back parameters, (continued)
- [Qemu-devel] [PULL 03/28] pci: Use struct instead of QDict to pass back parameters, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 07/28] qobject: Add helper macros for common scalar insertions, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 05/28] coccinelle: Add script to remove useless QObject casts, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 10/28] QemuOpts: Simplify qemu_opts_to_qdict(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 21/28] qobject-input-visitor: Document full_name_nth(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 01/28] tests/check-qdict: Fix missing brackets, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 04/28] pci: Reduce scope of error injection, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 22/28] qapi: Document intended use of @name within alternate visits, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 02/28] test-keyval: fix leaks, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 11/28] fdc-test: Avoid deprecated 'change' command, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 20/28] qmp: Improve QMP dispatch error messages,
Markus Armbruster <=
- [Qemu-devel] [PULL 26/28] qmp-shell: Cope with query-commands error, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 12/28] test-qga: Actually test 0xff sync bytes, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 27/28] qmp-shell: don't show version greeting if unavailable, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 15/28] qapi: New QAPI_CLONE_MEMBERS(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 19/28] sockets: Delete unused helper socket_address_crumple(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 14/28] sockets: Prepare inet_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 06/28] qobject: Drop useless QObject casts, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 25/28] qmp-shell: add -N option to skip negotiate, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 24/28] qmp-shell: add persistent command history, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 23/28] qobject-input-visitor: Catch misuse of end_struct vs. end_list, Markus Armbruster, 2017/05/04