[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/21] qapi: Make QObject input visitor set *list re
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 11/21] qapi: Make QObject input visitor set *list reliably |
Date: |
Thu, 23 Feb 2017 22:45:07 +0100 |
qobject_input_start_struct() sets *list, except when it fails because
qobject_input_get_object() fails, i.e. the input object doesn't exist.
All the other input visitor start_struct(), start_list(),
start_alternate() always set *obj / *list.
Change qobject_input_start_struct() to match.
Signed-off-by: Markus Armbruster <address@hidden>
---
qapi/qobject-input-visitor.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 2c2f883..d58696c 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -196,25 +196,21 @@ static void qobject_input_start_list(Visitor *v, const
char *name,
QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
const QListEntry *entry;
+ if (list) {
+ *list = NULL;
+ }
if (!qobj) {
return;
}
if (qobject_type(qobj) != QTYPE_QLIST) {
- if (list) {
- *list = NULL;
- }
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"list");
return;
}
entry = qobject_input_push(qiv, qobj, list);
- if (list) {
- if (entry) {
- *list = g_malloc0(size);
- } else {
- *list = NULL;
- }
+ if (entry && list) {
+ *list = g_malloc0(size);
}
}
--
2.7.4
- [Qemu-devel] [PATCH 19/21] tests: Cover partial input visit of list, (continued)
- [Qemu-devel] [PATCH 19/21] tests: Cover partial input visit of list, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PATCH 10/21] qapi: Clean up after commit 3d344c2, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PATCH 13/21] qapi: Drop string input visitor method optional(), Markus Armbruster, 2017/02/23
- [Qemu-devel] [PATCH 21/21] qapi: Improve qobject visitor documentation, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PATCH 12/21] qapi: Improve qobject input visitor error reporting, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PATCH 18/21] tests-qobject-input-strict: Merge into test-qobject-input-visitor, Markus Armbruster, 2017/02/23
- [Qemu-devel] [PATCH 11/21] qapi: Make QObject input visitor set *list reliably,
Markus Armbruster <=
- [Qemu-devel] [PATCH 17/21] qapi: Drop unused non-strict qobject input visitor, Markus Armbruster, 2017/02/23
Re: [Qemu-devel] [PATCH 00/21] qapi: QMP dispatch and input visitor work, no-reply, 2017/02/24