[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 8/9] hw/arm/vexpress: Check for CPU types in machine_run_board
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 8/9] hw/arm/vexpress: Check for CPU types in machine_run_board_init() |
Date: |
Mon, 29 Jan 2024 16:18:27 +0100 |
Leverage the common code introduced in commit c9cf636d48 ("machine:
Add a valid_cpu_types property") to check for the single valid CPU
type. Remove the now unused MachineClass::default_cpu_type field.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/vexpress.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index f1b45245d5..1a14c1933e 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -783,22 +783,30 @@ static void vexpress_class_init(ObjectClass *oc, void
*data)
static void vexpress_a9_class_init(ObjectClass *oc, void *data)
{
+ static const char * const valid_cpu_types[] = {
+ ARM_CPU_TYPE_NAME("cortex-a9"),
+ NULL
+ };
MachineClass *mc = MACHINE_CLASS(oc);
VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc);
mc->desc = "ARM Versatile Express for Cortex-A9";
- mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
+ mc->valid_cpu_types = valid_cpu_types;
vmc->daughterboard = &a9_daughterboard;
}
static void vexpress_a15_class_init(ObjectClass *oc, void *data)
{
+ static const char * const valid_cpu_types[] = {
+ ARM_CPU_TYPE_NAME("cortex-a15"),
+ NULL
+ };
MachineClass *mc = MACHINE_CLASS(oc);
VexpressMachineClass *vmc = VEXPRESS_MACHINE_CLASS(oc);
mc->desc = "ARM Versatile Express for Cortex-A15";
- mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15");
+ mc->valid_cpu_types = valid_cpu_types;
vmc->daughterboard = &a15_daughterboard;
--
2.41.0
- [PATCH v3 0/9] hw/arm: Check for CPU types in machine_run_board_init(), Philippe Mathieu-Daudé, 2024/01/29
- [PATCH v3 1/9] hw/arm/exynos: Add missing QOM parent for CPU cores, Philippe Mathieu-Daudé, 2024/01/29
- [PATCH v3 2/9] hw/arm/exynos: Check for CPU types in machine_run_board_init(), Philippe Mathieu-Daudé, 2024/01/29
- [PATCH v3 3/9] hw/arm/highbank: Add missing QOM parent for CPU cores, Philippe Mathieu-Daudé, 2024/01/29
- [PATCH v3 4/9] hw/arm/highbank: Check for CPU types in machine_run_board_init(), Philippe Mathieu-Daudé, 2024/01/29
- [PATCH v3 5/9] hw/arm/msf2: Simplify setting MachineClass::valid_cpu_types[], Philippe Mathieu-Daudé, 2024/01/29
- [PATCH v3 6/9] hw/arm/musca: Simplify setting MachineClass::valid_cpu_types[], Philippe Mathieu-Daudé, 2024/01/29
- [PATCH v3 7/9] hw/arm/npcm7xx_boards: Simplify setting MachineClass::valid_cpu_types[], Philippe Mathieu-Daudé, 2024/01/29
- [PATCH v3 8/9] hw/arm/vexpress: Check for CPU types in machine_run_board_init(),
Philippe Mathieu-Daudé <=
- [PATCH v3 9/9] hw/arm/zynq: Check for CPU types in machine_run_board_init(), Philippe Mathieu-Daudé, 2024/01/29