[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 6/6] hw/net/xilinx_axi: Use object_initialize_ch
From: |
Alistair Francis |
Subject: |
Re: [Qemu-devel] [PATCH 6/6] hw/net/xilinx_axi: Use object_initialize_child for correct ref. counting |
Date: |
Tue, 2 Jul 2019 09:18:46 -0700 |
On Mon, Jul 1, 2019 at 5:38 AM Philippe Mathieu-Daudé <address@hidden> 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.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Alistair
> ---
> 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 feeaca680e..aa0ae3c013 100644
> --- a/hw/net/xilinx_axienet.c
> +++ b/hw/net/xilinx_axienet.c
> @@ -990,15 +990,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);
> --
> 2.20.1
>
>
- [Qemu-devel] [PATCH 1/6] hw/arm: Use ARM_CPU_TYPE_NAME() macro when appropriate, (continued)
- [Qemu-devel] [PATCH 6/6] hw/net/xilinx_axi: Use object_initialize_child for correct ref. counting, Philippe Mathieu-Daudé, 2019/07/01
- Re: [Qemu-devel] [PATCH 6/6] hw/net/xilinx_axi: Use object_initialize_child for correct ref. counting,
Alistair Francis <=
- [Qemu-devel] [PATCH 3/6] hw/arm: Use sysbus_init_child_obj for correct reference counting, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-devel] [PATCH 4/6] hw/arm/fsl-imx: Add the cpu as child of the SoC object, Philippe Mathieu-Daudé, 2019/07/01
- Re: [Qemu-devel] [PATCH 0/6] hw/arm: Use ARM_CPU_TYPE_NAME() and object_initialize_child(), Philippe Mathieu-Daudé, 2019/07/01
- Re: [Qemu-devel] [PATCH 0/6] hw/arm: Use ARM_CPU_TYPE_NAME() and object_initialize_child(), no-reply, 2019/07/01