[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/28] qapi: Improve a QObject input visitor erro
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v4 11/28] qapi: Improve a QObject input visitor error message |
Date: |
Fri, 3 Mar 2017 13:32:31 +0100 |
The QObject input visitor has three error message formats:
* Parameter '%s' is missing
* "Invalid parameter type for '%s', expected: %s"
* "QMP input object member '%s' is unexpected"
The '%s' are member names (or "null", but I'll fix that later).
The last error message calls the thing "QMP input object member"
instead of "parameter". Misleading when the visitor is used on
QObjects that don't come from QMP. Change it to "Parameter '%s' is
unexpected".
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
qapi/qobject-input-visitor.c | 3 +--
tests/test-qga.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index ed6c24c..f3b6713 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -140,8 +140,7 @@ static void qobject_input_check_struct(Visitor *v, Error
**errp)
g_hash_table_iter_init(&iter, top_ht);
if (g_hash_table_iter_next(&iter, (void **)&key, NULL)) {
- error_setg(errp, "QMP input object member '%s' is unexpected",
- key);
+ error_setg(errp, "Parameter '%s' is unexpected", key);
}
}
}
diff --git a/tests/test-qga.c b/tests/test-qga.c
index 868b02a..ae97b57 100644
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -213,7 +213,7 @@ static void test_qga_invalid_args(gconstpointer fix)
desc = qdict_get_try_str(error, "desc");
g_assert_cmpstr(class, ==, "GenericError");
- g_assert_cmpstr(desc, ==, "QMP input object member 'foo' is unexpected");
+ g_assert_cmpstr(desc, ==, "Parameter 'foo' is unexpected");
QDECREF(ret);
}
--
2.7.4
- Re: [Qemu-devel] [PATCH v4 10/28] qmp: Improve QMP dispatch error messages, (continued)
[Qemu-devel] [PATCH v4 13/28] qapi: Make QObject input visitor set *list reliably, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 03/28] qmp-test: New, covering basic QMP protocol, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 08/28] qmp: Drop duplicated QMP command object checks, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 09/28] qmp: Eliminate silly QERR_QMP_* macros, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 18/28] test-qobject-input-visitor: Use strict visitor, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 01/28] qga: Fix crash on non-dictionary QMP argument, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 11/28] qapi: Improve a QObject input visitor error message,
Markus Armbruster <=
[Qemu-devel] [PATCH v4 06/28] qapi-introspect: Mangle --prefix argument properly for C, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 04/28] qmp: Dumb down how we run QMP command registration, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 12/28] qapi: Clean up after commit 3d344c2, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 15/28] qapi: Drop string input visitor method optional(), Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 27/28] qapi: Fix object input visit beyond end of list, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 17/28] qom: Make object_property_set_qobject()'s input visitor strict, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 26/28] tests: Cover input visit beyond end of list, Markus Armbruster, 2017/03/03
[Qemu-devel] [PATCH v4 23/28] tests: Cover partial input visit of list, Markus Armbruster, 2017/03/03