[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 28/31] hw/arm/virt: Check CPU type in machine_run_board_init()
From: |
Gavin Shan |
Subject: |
[PATCH v5 28/31] hw/arm/virt: Check CPU type in machine_run_board_init() |
Date: |
Wed, 15 Nov 2023 09:56:25 +1000 |
Set mc->valid_cpu_types so that the user specified CPU type can be
validated in machine_run_board_init(). We needn't to do the check
by ourselves.
Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/arm/virt.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 668c0d3194..1d149cf7a9 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -204,7 +204,7 @@ static const int a15irqmap[] = {
[VIRT_PLATFORM_BUS] = 112, /* ...to 112 + PLATFORM_BUS_NUM_IRQS -1 */
};
-static const char *valid_cpus[] = {
+static const char * const valid_cpu_types[] = {
#ifdef CONFIG_TCG
ARM_CPU_TYPE_NAME("cortex-a7"),
ARM_CPU_TYPE_NAME("cortex-a15"),
@@ -224,20 +224,9 @@ static const char *valid_cpus[] = {
ARM_CPU_TYPE_NAME("host"),
#endif
ARM_CPU_TYPE_NAME("max"),
+ NULL
};
-static bool cpu_type_valid(const char *cpu)
-{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(valid_cpus); i++) {
- if (strcmp(cpu, valid_cpus[i]) == 0) {
- return true;
- }
- }
- return false;
-}
-
static void create_randomness(MachineState *ms, const char *node)
{
struct {
@@ -2041,11 +2030,6 @@ static void machvirt_init(MachineState *machine)
unsigned int smp_cpus = machine->smp.cpus;
unsigned int max_cpus = machine->smp.max_cpus;
- if (!cpu_type_valid(machine->cpu_type)) {
- error_report("mach-virt: CPU type %s not supported",
machine->cpu_type);
- exit(1);
- }
-
possible_cpus = mc->possible_cpu_arch_ids(machine);
/*
@@ -2965,6 +2949,7 @@ static void virt_machine_class_init(ObjectClass *oc, void
*data)
#else
mc->default_cpu_type = ARM_CPU_TYPE_NAME("max");
#endif
+ mc->valid_cpu_types = valid_cpu_types;
mc->get_default_cpu_node_id = virt_get_default_cpu_node_id;
mc->kvm_type = virt_kvm_type;
assert(!mc->get_hotplug_handler);
--
2.41.0
- [PATCH v5 21/31] target/xtensa: Use generic cpu_list(), (continued)
- [PATCH v5 21/31] target/xtensa: Use generic cpu_list(), Gavin Shan, 2023/11/14
- [PATCH v5 22/31] target: Use generic cpu_model_from_type(), Gavin Shan, 2023/11/14
- [PATCH v5 23/31] machine: Constify MachineClass::valid_cpu_types[i], Gavin Shan, 2023/11/14
- [PATCH v5 24/31] machine: Use error handling when CPU type is checked, Gavin Shan, 2023/11/14
- [PATCH v5 25/31] machine: Introduce helper is_cpu_type_supported(), Gavin Shan, 2023/11/14
- [PATCH v5 26/31] machine: Print CPU model name instead of CPU type name, Gavin Shan, 2023/11/14
- [PATCH v5 27/31] hw/arm/virt: Hide host CPU model for tcg, Gavin Shan, 2023/11/14
- [PATCH v5 28/31] hw/arm/virt: Check CPU type in machine_run_board_init(),
Gavin Shan <=
- [PATCH v5 29/31] hw/arm/sbsa-ref: Check CPU type in machine_run_board_init(), Gavin Shan, 2023/11/14
- [PATCH v5 30/31] hw/arm: Check CPU type in machine_run_board_init(), Gavin Shan, 2023/11/14
- [PATCH v5 31/31] hw/riscv/shakti_c: Check CPU type in machine_run_board_init(), Gavin Shan, 2023/11/14
- Re: [PATCH v5 00/31] Unified CPU type check, Philippe Mathieu-Daudé, 2023/11/16
- Re: [PATCH v5 00/31] Unified CPU type check, Philippe Mathieu-Daudé, 2023/11/16