From ab8bf1d735133df5b5847bef0b0bea496d614a5a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 3 Dec 2015 17:37:39 +0100 Subject: [PATCH] spapr_drc: Change value of property "fdt" from null back to {} 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 404fb3c2b6..8be62c349b 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.11.0