From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Wt9-0005bT-0S for qemu-devel@nongnu.org; Thu, 03 Dec 2015 11:37:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4Wt5-0007Ho-Pc for qemu-devel@nongnu.org; Thu, 03 Dec 2015 11:37:46 -0500 From: Markus Armbruster Date: Thu, 3 Dec 2015 17:37:39 +0100 Message-Id: <1449160660-3777-3-git-send-email-armbru@redhat.com> In-Reply-To: <1449160660-3777-1-git-send-email-armbru@redhat.com> References: <1449160660-3777-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH for-2.5 2/3] spapr_drc: Change value of property "fdt" from null back to {} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, qemu-ppc@nongnu.org, agraf@suse.de, david@gibson.dropbear.id.au prop_get_fdt() misuses the visitor API: when fdt is null, it doesn't visit anything. object_property_get_qobject() happily object_property_get_qobject(). Amazingly, the latter survives the misuse. Turns out we've papered over it long before prop_get_fdt() existed, in commit 1d10b44. However, commit 6c2f9a1 changed how we paper over it, and as a side effect changed qom-get's value from {} to null. Change it right back by fixing the visitor misuse. Signed-off-by: Markus Armbruster --- hw/ppc/spapr_drc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 4e7a1d3..dad157f 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -259,6 +259,11 @@ static void prop_get_fdt(Object *obj, Visitor *v, void *opaque, void *fdt; if (!drc->fdt) { + visit_start_struct(v, NULL, NULL, name, 0, &err); + if (!err) { + visit_end_struct(v, &err); + } + error_propagate(errp, err); return; } -- 2.4.3