[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/27] qapi: Improve a QObject input visitor error
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 10/27] qapi: Improve a QObject input visitor error message |
Date: |
Sun, 5 Mar 2017 09:35:41 +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>
Message-Id: <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
- [Qemu-devel] [PULL v2 12/27] qapi: Make QObject input visitor set *list reliably, (continued)
- [Qemu-devel] [PULL v2 12/27] qapi: Make QObject input visitor set *list reliably, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 03/27] qmp-test: New, covering basic QMP protocol, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 02/27] libqtest: Work around a "QMP wants a newline" bug, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 09/27] qmp: Eliminate silly QERR_QMP_* macros, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 01/27] qga: Fix crash on non-dictionary QMP argument, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 23/27] test-qobject-input-visitor: Cover missing nested struct member, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 17/27] test-qobject-input-visitor: Use strict visitor, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 26/27] qapi: Fix object input visit beyond end of list, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 10/27] qapi: Improve a QObject input visitor error message,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 04/27] qmp: Dumb down how we run QMP command registration, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 16/27] qom: Make object_property_set_qobject()'s input visitor strict, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 13/27] qapi: Improve qobject input visitor error reporting, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 14/27] qapi: Drop string input visitor method optional(), Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 07/27] qmp: Clean up how we enforce capability negotiation, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 08/27] qmp: Drop duplicated QMP command object checks, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 25/27] tests: Cover input visit beyond end of list, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 22/27] tests: Cover partial input visit of list, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 15/27] qapi: Make string input and opts visitor require non-null input, Markus Armbruster, 2017/03/05
- [Qemu-devel] [PULL v2 24/27] qapi: Make input visitors detect unvisited list tails, Markus Armbruster, 2017/03/05