On Wed, Jun 07, 2017 at 07:49:14PM +0200, Cédric Le Goater wrote: > On 06/07/2017 07:16 PM, Greg Kurz wrote: > > Similarly to what was done to spapr with commit 249127d0dfeb, this patch > > ensures that we don't keep an extra reference on the ICPState object. Also > > since the object was just created and not reparented yet, the call to > > object_property_add_child() should never fail: let's pass &error_abort to > > make this clear. > > > > Signed-off-by: Greg Kurz <gr...@kaod.org> > > Reviewed-by: Cédric Le Goater <c...@kaod.org>
Applied to ppc-for-2.10, thanks. > > Thanks, > > C. > > > --- > > hw/ppc/pnv_core.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c > > index 1b7ec70f033d..e8a9a94d5a24 100644 > > --- a/hw/ppc/pnv_core.c > > +++ b/hw/ppc/pnv_core.c > > @@ -119,7 +119,8 @@ static void pnv_core_realize_child(Object *child, > > XICSFabric *xi, Error **errp) > > Object *obj; > > > > obj = object_new(TYPE_PNV_ICP); > > - object_property_add_child(OBJECT(cpu), "icp", obj, NULL); > > + object_property_add_child(OBJECT(cpu), "icp", obj, &error_abort); > > + object_unref(obj); > > object_property_add_const_link(obj, "xics", OBJECT(xi), &error_abort); > > object_property_set_bool(obj, true, "realized", &local_err); > > if (local_err) { > > > -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature