From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4k7x-0006Cy-Un for qemu-devel@nongnu.org; Fri, 04 Dec 2015 01:45:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4k7x-00059k-0t for qemu-devel@nongnu.org; Fri, 04 Dec 2015 01:45:57 -0500 From: David Gibson Date: Fri, 4 Dec 2015 17:46:32 +1100 Message-Id: <1449211592-18783-4-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1449211592-18783-1-git-send-email-david@gibson.dropbear.id.au> References: <1449211592-18783-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PULL 3/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: peter.maydell@linaro.org, armbru@redhat.com Cc: thuth@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson From: Markus Armbruster 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 Signed-off-by: David Gibson --- 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 404fb3c..8be62c3 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.5.0