[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 7/9] hw/arm/sbsa-ref: Check CPU type in machine_run_board_init
From: |
Gavin Shan |
Subject: |
[PATCH v9 7/9] hw/arm/sbsa-ref: Check CPU type in machine_run_board_init() |
Date: |
Mon, 4 Dec 2023 10:47:24 +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 it
by ourselves.
Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/arm/sbsa-ref.c | 36 ++++++++++--------------------------
1 file changed, 10 insertions(+), 26 deletions(-)
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index f3c9704693..477dca0637 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -145,27 +145,6 @@ static const int sbsa_ref_irqmap[] = {
[SBSA_GWDT_WS0] = 16,
};
-static const char * const valid_cpus[] = {
- ARM_CPU_TYPE_NAME("cortex-a57"),
- ARM_CPU_TYPE_NAME("cortex-a72"),
- ARM_CPU_TYPE_NAME("neoverse-n1"),
- ARM_CPU_TYPE_NAME("neoverse-v1"),
- ARM_CPU_TYPE_NAME("neoverse-n2"),
- ARM_CPU_TYPE_NAME("max"),
-};
-
-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 uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState *sms, int idx)
{
uint8_t clustersz = ARM_DEFAULT_CPUS_PER_CLUSTER;
@@ -733,11 +712,6 @@ static void sbsa_ref_init(MachineState *machine)
const CPUArchIdList *possible_cpus;
int n, sbsa_max_cpus;
- if (!cpu_type_valid(machine->cpu_type)) {
- error_report("sbsa-ref: CPU type %s not supported", machine->cpu_type);
- exit(1);
- }
-
if (kvm_enabled()) {
error_report("sbsa-ref: KVM is not supported for this machine");
exit(1);
@@ -898,10 +872,20 @@ static void sbsa_ref_instance_init(Object *obj)
static void sbsa_ref_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
+ static const char * const valid_cpu_types[] = {
+ ARM_CPU_TYPE_NAME("cortex-a57"),
+ ARM_CPU_TYPE_NAME("cortex-a72"),
+ ARM_CPU_TYPE_NAME("neoverse-n1"),
+ ARM_CPU_TYPE_NAME("neoverse-v1"),
+ ARM_CPU_TYPE_NAME("neoverse-n2"),
+ ARM_CPU_TYPE_NAME("max"),
+ NULL,
+ };
mc->init = sbsa_ref_init;
mc->desc = "QEMU 'SBSA Reference' ARM Virtual Machine";
mc->default_cpu_type = ARM_CPU_TYPE_NAME("neoverse-n1");
+ mc->valid_cpu_types = valid_cpu_types;
mc->max_cpus = 512;
mc->pci_allow_0_address = true;
mc->minimum_page_bits = 12;
--
2.42.0
- [PATCH v9 0/9] Unified CPU type check, Gavin Shan, 2023/12/03
- [PATCH v9 1/9] machine: Use error handling when CPU type is checked, Gavin Shan, 2023/12/03
- [PATCH v9 2/9] machine: Introduce helper is_cpu_type_supported(), Gavin Shan, 2023/12/03
- [PATCH v9 3/9] machine: Improve is_cpu_type_supported(), Gavin Shan, 2023/12/03
- [PATCH v9 4/9] machine: Print CPU model name instead of CPU type, Gavin Shan, 2023/12/03
- [PATCH v9 5/9] hw/arm/virt: Hide host CPU model for tcg, Gavin Shan, 2023/12/03
- [PATCH v9 6/9] hw/arm/virt: Check CPU type in machine_run_board_init(), Gavin Shan, 2023/12/03
- [PATCH v9 7/9] hw/arm/sbsa-ref: Check CPU type in machine_run_board_init(),
Gavin Shan <=
- [PATCH v9 8/9] hw/arm: Check CPU type in machine_run_board_init(), Gavin Shan, 2023/12/03
- [PATCH v9 9/9] hw/riscv/shakti_c: Check CPU type in machine_run_board_init(), Gavin Shan, 2023/12/03
- Re: [PATCH v9 0/9] Unified CPU type check, Gavin Shan, 2023/12/11