On 06/13/2018 08:57 AM, David Gibson wrote: > In pnv_core_realize() we call two functions with an Error * parameter in > succession, which means if they both cause errors we'll lose the first one. > Add an extra test/escape to fix this.
I tend now to pass just NULL or &error_abort to object_property_add_child() and object_property_add_const_link(). These calls should just not fail. Reviewed-by: Cédric Le Goater <c...@kaod.org> Thanks, C. > > Signed-off-by: David Gibson <da...@gibson.dropbear.id.au> > --- > hw/ppc/pnv_core.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c > index 13ad7d9e04..efb68226bb 100644 > --- a/hw/ppc/pnv_core.c > +++ b/hw/ppc/pnv_core.c > @@ -173,6 +173,9 @@ static void pnv_core_realize(DeviceState *dev, Error > **errp) > > snprintf(name, sizeof(name), "thread[%d]", i); > object_property_add_child(OBJECT(pc), name, obj, &local_err); > + if (local_err) { > + goto err; > + } > object_property_add_alias(obj, "core-pir", OBJECT(pc), > "pir", &local_err); > if (local_err) { >