[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 4/6] hw/arm/fsl-imx: Add the cpu as child of the So
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-arm] [PATCH v2 4/6] hw/arm/fsl-imx: Add the cpu as child of the SoC object |
Date: |
Fri, 23 Aug 2019 16:32:47 +0200 |
Child properties form the composition tree. All objects need to be
a child of another object. Objects can only be a child of one object.
Respect this with the i.MX SoC, to get a cleaner composition tree.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
v2: reworded commit description with Markus suggestions
---
hw/arm/fsl-imx25.c | 4 +++-
hw/arm/fsl-imx31.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 2b2fdb203a..3cb5a8fdfd 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -36,7 +36,9 @@ static void fsl_imx25_init(Object *obj)
FslIMX25State *s = FSL_IMX25(obj);
int i;
- object_initialize(&s->cpu, sizeof(s->cpu), ARM_CPU_TYPE_NAME("arm926"));
+ object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),
+ ARM_CPU_TYPE_NAME("arm926"),
+ &error_abort, NULL);
sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),
TYPE_IMX_AVIC);
diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index 6760de3c8c..55e90d104b 100644
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -33,7 +33,9 @@ static void fsl_imx31_init(Object *obj)
FslIMX31State *s = FSL_IMX31(obj);
int i;
- object_initialize(&s->cpu, sizeof(s->cpu), ARM_CPU_TYPE_NAME("arm1136"));
+ object_initialize_child(obj, "cpu", &s->cpu, sizeof(s->cpu),
+ ARM_CPU_TYPE_NAME("arm1136"),
+ &error_abort, NULL);
sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),
TYPE_IMX_AVIC);
--
2.20.1
- [Qemu-arm] [PATCH v2 0/6] hw/arm: Use ARM_CPU_TYPE_NAME() and object_initialize_child(), Philippe Mathieu-Daudé, 2019/08/23
- [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é <=
- [Qemu-arm] [PATCH v2 5/6] hw/dma/xilinx_axi: Use object_initialize_child for correct ref. counting, Philippe Mathieu-Daudé, 2019/08/23
- [Qemu-arm] [PATCH v2 6/6] hw/net/xilinx_axi: Use object_initialize_child for correct ref. counting, Philippe Mathieu-Daudé, 2019/08/23