On 8/23/19 4:32 PM, Philippe Mathieu-Daudé wrote: > As explained in commit aff39be0ed97: > > Both functions, object_initialize() and object_property_add_child() > increase the reference counter of the new object, so one of the > references has to be dropped afterwards to get the reference > counting right. Otherwise the child object will not be properly > cleaned up when the parent gets destroyed. > Thus let's use now object_initialize_child() instead to get the > reference counting here right. > > Reviewed-by: Alistair Francis <alistair.fran...@wdc.com> > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/net/xilinx_axienet.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c > index d8716a1f73..2c8c065401 100644 > --- a/hw/net/xilinx_axienet.c > +++ b/hw/net/xilinx_axienet.c > @@ -994,15 +994,14 @@ static void xilinx_enet_init(Object *obj) > XilinxAXIEnet *s = XILINX_AXI_ENET(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > > - object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev), > - TYPE_XILINX_AXI_ENET_DATA_STREAM); > - object_initialize(&s->rx_control_dev, sizeof(s->rx_control_dev), > - TYPE_XILINX_AXI_ENET_CONTROL_STREAM); > - object_property_add_child(OBJECT(s), "axistream-connected-target", > - (Object *)&s->rx_data_dev, &error_abort); > - object_property_add_child(OBJECT(s), > "axistream-control-connected-target", > - (Object *)&s->rx_control_dev, &error_abort); > - > + object_initialize_child(OBJECT(s), "axistream-connected-target", > + &s->rx_data_dev, sizeof(s->rx_data_dev), > + TYPE_XILINX_AXI_ENET_DATA_STREAM, &error_abort, > + NULL); > + object_initialize_child(OBJECT(s), "axistream-control-connected-target", > + &s->rx_control_dev, sizeof(s->rx_control_dev), > + TYPE_XILINX_AXI_ENET_CONTROL_STREAM, > &error_abort, > + NULL); > sysbus_init_irq(sbd, &s->irq); > > memory_region_init_io(&s->iomem, OBJECT(s), &enet_ops, s, "enet", > 0x40000); >
Reviewed-by: Thomas Huth <th...@redhat.com>
