From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acLya-0008V5-NW for qemu-devel@nongnu.org; Sat, 05 Mar 2016 18:51:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acLyZ-0005qU-QO for qemu-devel@nongnu.org; Sat, 05 Mar 2016 18:51:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acLyZ-0005qL-Lz for qemu-devel@nongnu.org; Sat, 05 Mar 2016 18:51:11 -0500 From: Eric Blake Date: Sat, 5 Mar 2016 16:50:58 -0700 Message-Id: <1457221861-18067-16-git-send-email-eblake@redhat.com> In-Reply-To: <1457221861-18067-1-git-send-email-eblake@redhat.com> References: <1457221861-18067-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v13 15/18] qom: Wrap prop visit in visit_start_struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= 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 --- 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 f075b3a..8efb8d1 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -117,12 +117,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.0