[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/18] hw/arm/digic: Replace object_initialize(ARMCPU) by object_
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 12/18] hw/arm/digic: Replace object_initialize(ARMCPU) by object_new(ARMCPU) |
Date: |
Tue, 10 Jan 2023 17:44:00 +0100 |
Replace the ARMCPU field in DigicState by a reference to
an allocated ARMCPU. Instead of initializing the field
with object_initialize(), allocate it with object_new().
As we don't access ARMCPU internal fields or size, we can
move digic.c from arm_ss[] to the more generic softmmu_ss[].
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/digic.c | 7 ++++---
hw/arm/meson.build | 7 ++-----
include/hw/arm/digic.h | 4 ++--
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index 6df5547977..fe24b91db6 100644
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -36,7 +36,8 @@ static void digic_init(Object *obj)
DigicState *s = DIGIC(obj);
int i;
- object_initialize_child(obj, "cpu", &s->cpu, ARM_CPU_TYPE_NAME("arm946"));
+ s->cpu = ARM_CPU(object_new(ARM_CPU_TYPE_NAME("arm946")));
+ object_property_add_child(obj, "cpu", OBJECT(s->cpu));
for (i = 0; i < DIGIC4_NB_TIMERS; i++) {
g_autofree char *name = g_strdup_printf("timer[%d]", i);
@@ -52,12 +53,12 @@ static void digic_realize(DeviceState *dev, Error **errp)
SysBusDevice *sbd;
int i;
- if (!object_property_set_bool(OBJECT(&s->cpu), "reset-hivecs", true,
+ if (!object_property_set_bool(OBJECT(s->cpu), "reset-hivecs", true,
errp)) {
return;
}
- if (!qdev_realize(DEVICE(&s->cpu), NULL, errp)) {
+ if (!qdev_realize(DEVICE(s->cpu), NULL, errp)) {
return;
}
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index f7e1d4add6..0c7554b763 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -2,10 +2,6 @@ arm_ss = ss.source_set()
arm_ss.add(files('boot.c'), fdt)
arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c'))
arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c'))
-arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c'))
-arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c'))
-arm_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.c'))
-arm_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c'))
arm_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c',
'npcm7xx_boards.c'))
arm_ss.add(when: 'CONFIG_NSERIES', if_true: files('nseries.c'))
arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c'))
@@ -18,7 +14,6 @@ arm_ss.add(when: 'CONFIG_SABRELITE', if_true:
files('sabrelite.c'))
arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c'))
arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210.c'))
arm_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c', 'pxa2xx_gpio.c',
'pxa2xx_pic.c'))
-arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c'))
arm_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c', 'omap2.c'))
arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c',
'cubieboard.c'))
arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c',
'orangepi.c'))
@@ -42,6 +37,8 @@ softmmu_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true:
files('smmu-common.c'))
softmmu_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c'))
softmmu_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c'))
softmmu_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c'))
+softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c'))
+softmmu_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c'))
softmmu_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c'))
softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c'))
softmmu_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c'))
diff --git a/include/hw/arm/digic.h b/include/hw/arm/digic.h
index 646802806e..1bfd6788c9 100644
--- a/include/hw/arm/digic.h
+++ b/include/hw/arm/digic.h
@@ -18,7 +18,7 @@
#ifndef HW_ARM_DIGIC_H
#define HW_ARM_DIGIC_H
-#include "target/arm/cpu.h"
+#include "hw/arm/cpu.h"
#include "hw/timer/digic-timer.h"
#include "hw/char/digic-uart.h"
#include "qom/object.h"
@@ -34,7 +34,7 @@ struct DigicState {
DeviceState parent_obj;
/*< public >*/
- ARMCPU cpu;
+ ARMCPU *cpu;
DigicTimerState timer[DIGIC4_NB_TIMERS];
DigicUartState uart;
--
2.38.1
- [PATCH 03/18] target/arm/cpregs: Include missing 'target/arm/cpu.h' header, (continued)
- [PATCH 03/18] target/arm/cpregs: Include missing 'target/arm/cpu.h' header, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 04/18] hw/arm: Use full "target/arm/cpu.h" path to include target's "cpu.h", Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 05/18] target/arm: Move CPU QOM type definitions to "hw/arm/cpu.h", Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 06/18] target/arm: Move CPU definitions consumed by HW model to "hw/arm/cpu.h", Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 07/18] hw/arm: Move more units to softmmu_ss[], Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 09/18] hw/arm/armv7m: Remove 'target/arm/cpu.h' from NVIC header, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 10/18] hw/arm: Move various armv7m-related units to softmmu_ss[], Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 08/18] hw/arm: Move units to softmmu[] by replacing "{target -> hw}/arm/cpu.h", Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 11/18] hw/arm/digic: Remove unnecessary target_long use, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 12/18] hw/arm/digic: Replace object_initialize(ARMCPU) by object_new(ARMCPU),
Philippe Mathieu-Daudé <=
- [PATCH 13/18] hw/arm/fsl-imx: Correct GPIO/GPT index in QOM tree, Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 14/18] hw/arm/fsl-imx25: Replace object_initialize(ARMCPU) by object_new(), Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 15/18] hw/arm/fsl-imx31: Replace object_initialize(ARMCPU) by object_new(), Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 16/18] hw/arm/fsl-imx7: Replace object_initialize(ARMCPU) by object_new(), Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 17/18] hw/arm/fsl-imx6: Replace object_initialize(ARMCPU) by object_new(), Philippe Mathieu-Daudé, 2023/01/10
- [PATCH 18/18] hw/arm/allwinner: Replace object_initialize(ARMCPU) by object_new(), Philippe Mathieu-Daudé, 2023/01/10