[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/10] hw/arm/realview: Move 'is_pb' to RealviewMachineClass
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 06/10] hw/arm/realview: Move 'is_pb' to RealviewMachineClass |
Date: |
Wed, 24 May 2023 16:59:02 +0200 |
Instead of having each machine instance set whether EP/PB,
set it once in their class_init() handler.
Arguably this could be extracted from the board_id field.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/realview.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index c354ce0cfa..1a3a64e0ce 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -34,6 +34,7 @@ struct RealviewMachineClass {
MachineClass parent_obj;
int board_id;
+ bool is_pb;
};
typedef struct RealviewMachineClass RealviewMachineClass;
@@ -94,7 +95,7 @@ static void realview_init(MachineState *machine,
unsigned int smp_cpus = machine->smp.cpus;
qemu_irq cpu_irq[4];
int is_mpcore = 0;
- int is_pb = 0;
+ bool is_pb = rmc->is_pb;
uint32_t proc_id = 0;
uint32_t sys_id;
ram_addr_t low_ram_size;
@@ -109,11 +110,9 @@ static void realview_init(MachineState *machine,
periphbase = 0x10100000;
break;
case BOARD_PB_A8:
- is_pb = 1;
break;
case BOARD_PBX_A9:
is_mpcore = 1;
- is_pb = 1;
periphbase = 0x1f000000;
break;
}
@@ -446,6 +445,7 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void
*data)
mc->init = realview_pb_a8_init;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8");
rmc->board_id = 0x769;
+ rmc->is_pb = true;
}
static void realview_pbx_a9_class_init(ObjectClass *oc, void *data)
@@ -458,6 +458,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc,
void *data)
mc->max_cpus = 4;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
rmc->board_id = 0x76d;
+ rmc->is_pb = true;
}
static const TypeInfo realview_machine_types[] = {
--
2.38.1
- [PATCH 01/10] hw/arm/realview: Simplify using 'break' statement, (continued)
- [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é, 2023/05/24
- [PATCH 06/10] hw/arm/realview: Move 'is_pb' to RealviewMachineClass,
Philippe Mathieu-Daudé <=
- [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