[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH for-2.5 2/3] spapr_drc: Change value of property "fdt"
From: |
Markus Armbruster |
Subject: |
[Qemu-ppc] [PATCH for-2.5 2/3] spapr_drc: Change value of property "fdt" from null back to {} |
Date: |
Thu, 3 Dec 2015 17:37:39 +0100 |
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 <address@hidden>
---
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
Re: [Qemu-ppc] [PATCH for-2.5 2/3] spapr_drc: Change value of property "fdt" from null back to {}, David Gibson, 2015/12/03
[Qemu-ppc] [PATCH for-2.5 1/3] spapr_drc: Handle visitor errors properly, Markus Armbruster, 2015/12/03