[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v14 16/19] qom: Wrap prop visit in visit_start_struc
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v14 16/19] qom: Wrap prop visit in visit_start_struct |
Date: |
Fri, 8 Apr 2016 10:13:09 -0600 |
The qmp-input visitor was playing rather fast and loose: when
visiting a QDict, you could grab members of the root dictionary
without first pushing into the dict. But we are about to tighten
the input visitor, at which point user_creatable_add_type() MUST
follow the same paradigms as everyone else, of pushing into the
struct before grabbing its keys, because the value of 'name'
should be ignored on the top-level visit.
The change has no impact to the testsuite now, but is required to
avoid a failure in tests/test-netfilter once qmp-input is made
stricter.
Signed-off-by: Eric Blake <address@hidden>
---
v14: no change
v13: no change
v12: new patch
---
qom/object_interfaces.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index a0bf6b7..62ec75a 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -118,12 +118,23 @@ Object *user_creatable_add_type(const char *type, const
char *id,
obj = object_new(type);
if (qdict) {
+ visit_start_struct(v, NULL, NULL, 0, &local_err);
+ if (local_err) {
+ goto out;
+ }
for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
object_property_set(obj, v, e->key, &local_err);
if (local_err) {
- goto out;
+ break;
}
}
+ if (!local_err) {
+ visit_check_struct(v, &local_err);
+ }
+ visit_end_struct(v);
+ if (local_err) {
+ goto out;
+ }
}
object_property_add_child(object_get_objects_root(),
--
2.5.5
- Re: [Qemu-devel] [PATCH v14 02/19] qapi-visit: Add visitor.type classification, (continued)
[Qemu-devel] [PATCH v14 16/19] qom: Wrap prop visit in visit_start_struct,
Eric Blake <=
[Qemu-devel] [PATCH v14 08/19] qapi: Document visitor interfaces, add assertions, Eric Blake, 2016/04/08
[Qemu-devel] [PATCH v14 10/19] qapi: Add visit_type_null() visitor, Eric Blake, 2016/04/08
[Qemu-devel] [PATCH v14 18/19] qapi: Simplify semantics of visit_next_list(), Eric Blake, 2016/04/08