From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar2IJ-0004kv-Am for qemu-devel@nongnu.org; Fri, 15 Apr 2016 07:52:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ar2IF-0006NC-98 for qemu-devel@nongnu.org; Fri, 15 Apr 2016 07:52:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar2IF-0006N8-3T for qemu-devel@nongnu.org; Fri, 15 Apr 2016 07:52:11 -0400 From: Markus Armbruster References: <1460131992-32278-1-git-send-email-eblake@redhat.com> <1460131992-32278-17-git-send-email-eblake@redhat.com> Date: Fri, 15 Apr 2016 13:52:08 +0200 In-Reply-To: <1460131992-32278-17-git-send-email-eblake@redhat.com> (Eric Blake's message of "Fri, 8 Apr 2016 10:13:09 -0600") Message-ID: <87lh4frswn.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v14 16/19] qom: Wrap prop visit in visit_start_struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, Andreas =?utf-8?Q?F=C3=A4rber?= Eric Blake writes: > 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. Aha, this is another second client playing fast and loose. > > 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 > > --- > 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); Does this find errors that weren't found before? > + } > + visit_end_struct(v); > + if (local_err) { > + goto out; > + } > } > > object_property_add_child(object_get_objects_root(),