[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/10] hw/arm/realview: Move 'board_id' to RealviewMachineClass
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 05/10] hw/arm/realview: Move 'board_id' to RealviewMachineClass |
Date: |
Wed, 24 May 2023 16:59:01 +0200 |
Instead of having each machine instance resolve its board ID,
set it once in their class_init() handler.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/realview.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 6970e8a469..c354ce0cfa 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -32,6 +32,8 @@
struct RealviewMachineClass {
MachineClass parent_obj;
+
+ int board_id;
};
typedef struct RealviewMachineClass RealviewMachineClass;
@@ -49,7 +51,6 @@ static struct arm_boot_info realview_binfo = {
.smp_bootreg_addr = SMP_BOOTREG_ADDR,
};
-/* The following two lists must be consistent. */
enum realview_board_type {
BOARD_EB,
BOARD_EB_MPCORE,
@@ -57,13 +58,6 @@ enum realview_board_type {
BOARD_PBX_A9,
};
-static const int realview_board_id[] = {
- 0x33b,
- 0x33b,
- 0x769,
- 0x76d
-};
-
static void split_irq_from_named(DeviceState *src, const char* outname,
qemu_irq out1, qemu_irq out2) {
DeviceState *splitter = qdev_new(TYPE_SPLIT_IRQ);
@@ -81,6 +75,7 @@ static void split_irq_from_named(DeviceState *src, const
char* outname,
static void realview_init(MachineState *machine,
enum realview_board_type board_type)
{
+ RealviewMachineClass *rmc = REALVIEW_MACHINE_GET_CLASS(machine);
ARMCPU *cpu = NULL;
CPUARMState *env;
MemoryRegion *sysmem = get_system_memory();
@@ -385,7 +380,7 @@ static void realview_init(MachineState *machine,
memory_region_add_subregion(sysmem, SMP_BOOT_ADDR, ram_hack);
realview_binfo.ram_size = ram_size;
- realview_binfo.board_id = realview_board_id[board_type];
+ realview_binfo.board_id = rmc->board_id;
realview_binfo.loader_start = (board_type == BOARD_PB_A8 ? 0x70000000 : 0);
arm_load_kernel(ARM_CPU(first_cpu), machine, &realview_binfo);
}
@@ -420,41 +415,49 @@ static void realview_common_class_init(ObjectClass *oc,
void *data)
static void realview_eb_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ RealviewMachineClass *rmc = REALVIEW_MACHINE_CLASS(oc);
mc->desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)";
mc->init = realview_eb_init;
mc->block_default_type = IF_SCSI;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
+ rmc->board_id = 0x33b;
}
static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ RealviewMachineClass *rmc = REALVIEW_MACHINE_CLASS(oc);
mc->desc = "ARM RealView Emulation Baseboard (ARM11MPCore)";
mc->init = realview_eb_mpcore_init;
mc->block_default_type = IF_SCSI;
mc->max_cpus = 4;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm11mpcore");
+ rmc->board_id = 0x33b;
}
static void realview_pb_a8_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ RealviewMachineClass *rmc = REALVIEW_MACHINE_CLASS(oc);
mc->desc = "ARM RealView Platform Baseboard for Cortex-A8";
mc->init = realview_pb_a8_init;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8");
+ rmc->board_id = 0x769;
}
static void realview_pbx_a9_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ RealviewMachineClass *rmc = REALVIEW_MACHINE_CLASS(oc);
mc->desc = "ARM RealView Platform Baseboard Explore for Cortex-A9";
mc->init = realview_pbx_a9_init;
mc->max_cpus = 4;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
+ rmc->board_id = 0x76d;
}
static const TypeInfo realview_machine_types[] = {
--
2.38.1
- [PATCH 00/10] hw/arm/realview: Introduce abstract RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 01/10] hw/arm/realview: Simplify using 'break' statement, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 03/10] hw/arm/realview: Introduce abstract RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 02/10] hw/arm/realview: Declare QOM types using DEFINE_TYPES() macro, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 04/10] hw/arm/realview: Factor realview_common_class_init() out, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 05/10] hw/arm/realview: Move 'board_id' to RealviewMachineClass,
Philippe Mathieu-Daudé <=
- [PATCH 06/10] hw/arm/realview: Move 'is_pb' to RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 07/10] hw/arm/realview: Move 'mpcore_periphbase' to RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 08/10] hw/arm/realview: Move 'loader_start' to RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 09/10] hw/arm/realview: Use generic realview_common_machine_init(), Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 10/10] hw/arm/realview: Set MachineClass::default_nic in machine_class_init(), Philippe Mathieu-Daudé, 2023/05/24