Commit ab8bf1d7 authored Dec 03, 2015 by Markus Armbruster Committed by David Gibson Dec 04, 2015

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 1d10b445.

However, commit 6c2f9a15 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 <armbru@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

parent c401ae8c

hw/ppc/spapr_drc.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}