[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 5/6] hw/dma/xilinx_axi: Use object_initialize_child
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-arm] [PATCH v2 5/6] hw/dma/xilinx_axi: Use object_initialize_child for correct ref. counting |
Date: |
Fri, 23 Aug 2019 16:32:48 +0200 |
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 <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
v2: fix typo ENET -> DMA in TYPE macro name
---
hw/dma/xilinx_axidma.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index d176df6d44..a254275b64 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -566,14 +566,14 @@ static void xilinx_axidma_init(Object *obj)
XilinxAXIDMA *s = XILINX_AXI_DMA(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
- object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev),
- TYPE_XILINX_AXI_DMA_DATA_STREAM);
- object_initialize(&s->rx_control_dev, sizeof(s->rx_control_dev),
- TYPE_XILINX_AXI_DMA_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_DMA_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_DMA_CONTROL_STREAM, &error_abort,
+ NULL);
sysbus_init_irq(sbd, &s->streams[0].irq);
sysbus_init_irq(sbd, &s->streams[1].irq);
--
2.20.1
- [Qemu-arm] [PATCH v2 1/6] hw/arm: Use ARM_CPU_TYPE_NAME() macro when appropriate, (continued)
- [Qemu-arm] [PATCH v2 1/6] hw/arm: Use ARM_CPU_TYPE_NAME() macro when appropriate, Philippe Mathieu-Daudé, 2019/08/23
- [Qemu-arm] [PATCH v2 2/6] hw/arm: Use object_initialize_child for correct reference counting, Philippe Mathieu-Daudé, 2019/08/23
- [Qemu-arm] [PATCH v2 3/6] hw/arm: Use sysbus_init_child_obj for correct reference counting, Philippe Mathieu-Daudé, 2019/08/23
- [Qemu-arm] [PATCH v2 4/6] hw/arm/fsl-imx: Add the cpu as child of the SoC object, Philippe Mathieu-Daudé, 2019/08/23
- [Qemu-arm] [PATCH v2 5/6] hw/dma/xilinx_axi: Use object_initialize_child for correct ref. counting,
Philippe Mathieu-Daudé <=
- [Qemu-arm] [PATCH v2 6/6] hw/net/xilinx_axi: Use object_initialize_child for correct ref. counting, Philippe Mathieu-Daudé, 2019/08/23