On Fri, 6 Mar 2020 11:33:07 +0100 Philippe Mathieu-Daudé <phi...@redhat.com> wrote:
> On 3/3/20 10:12 AM, Igor Mammedov wrote: > > SOC object returned by object_new() is leaked in current code. > > Set SOC parent explicitly to board and then unref to SOC object > > to make sure that refererence returned by object_new() is taken > > care of. > > > > The SOC object will be kept alive by its parent (machine) and > > will be automatically freed when MachineState is destroyed. > > > > Signed-off-by: Igor Mammedov <imamm...@redhat.com> > > Reported-by: Andrew Jones <drjo...@redhat.com> > > --- > > hw/arm/cubieboard.c | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c > > index 089f9a30c1..12f8ac798d 100644 > > --- a/hw/arm/cubieboard.c > > +++ b/hw/arm/cubieboard.c > > @@ -30,9 +30,14 @@ static struct arm_boot_info cubieboard_binfo = { > > > > static void cubieboard_init(MachineState *machine) > > { > > - AwA10State *a10 = AW_A10(object_new(TYPE_AW_A10)); > > + AwA10State *a10; > > Error *err = NULL; > > > > What about using object_new_with_props similarly to commit e4c81e3a451f? I prefer explicit object_property_add_child() and would use above only if there are list of properties to feed to it. > a10 = AW_A10(object_new_with_props(TYPE_AW_A10, OBJECT(s), "soc", > &err, NULL)); > if (err != NULL) { > error_propagate(errp, err); > return; > } > > > + a10 = AW_A10(object_new(TYPE_AW_A10)); > > + object_property_add_child(OBJECT(machine), "soc", OBJECT(a10), > > + &error_abort); > > + object_unref(OBJECT(a10)); > > + > > object_property_set_int(OBJECT(&a10->emac), 1, "phy-addr", &err); > > if (err != NULL) { > > error_reportf_err(err, "Couldn't set phy address: "); > > >