This series bases on Phil's repository because the prepatory commits have been queued to the branch.
https://gitlab.com/philmd/qemu.git (branch: cpus-next) There are two places where the user specified CPU type is checked to see if it's supported or allowed by the board: machine_run_board_init() and mc->init(). We don't have to maintain two duplicate sets of logic. This series intends to move the check to machine_run_board_init() so that we have unified CPU type check. This series can be checked out from: g...@github.com:gwshan/qemu.git (branch: kvm/cpu-type) PATCH[1-4] refactors and improves the logic to validate CPU type in machine_run_board_init() PATCH[5-9] validates the CPU type in machine_run_board_init() for the individual boards v1: https://lists.nongnu.org/archive/html/qemu-arm/2023-07/msg00302.html v2: https://lists.nongnu.org/archive/html/qemu-arm/2023-07/msg00528.html v3: https://lists.nongnu.org/archive/html/qemu-arm/2023-09/msg00157.html v4: https://lists.nongnu.org/archive/html/qemu-arm/2023-11/msg00005.html v5: https://lists.nongnu.org/archive/html/qemu-arm/2023-11/msg00611.html v6: https://lists.nongnu.org/archive/html/qemu-arm/2023-11/msg00768.html v7: https://lists.nongnu.org/archive/html/qemu-arm/2023-11/msg01045.html Testing ======= Before the series is applied: [gshan@gshan q]$ ./build/qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported [gshan@gshan q]$ ./build/qemu-system-aarch64 -M sbsa-ref -cpu cortex-a53 qemu-system-aarch64: sbsa-ref: CPU type cortex-a53-arm-cpu not supported [gshan@gshan q]$ ./build/qemu-system-aarch64 -M sbsa-ref -cpu sa1100 qemu-system-aarch64: sbsa-ref: CPU type sa1100-arm-cpu not supported [gshan@gshan q]$ ./build/qemu-system-aarch64 -M sbsa-ref -cpu host qemu-system-aarch64: unable to find CPU model 'host' After the series is applied: [gshan@gshan q]$ ./build/qemu-system-aarch64 -M virt -cpu cortex-a8 qemu-system-aarch64: Invalid CPU model: cortex-a8 The valid models are: cortex-a7, cortex-a15, cortex-a35, cortex-a55, \ cortex-a72, cortex-a76, cortex-a710, a64fx, \ neoverse-n1, neoverse-v1, neoverse-n2, cortex-a53, \ cortex-a57, max [gshan@gshan q]$ ./build/qemu-system-aarch64 -M sbsa-ref -cpu cortex-a53 qemu-system-aarch64: Invalid CPU model: cortex-a53 The valid models are: cortex-a57, cortex-a72, neoverse-n1, neoverse-v1, \ neoverse-n2, max [gshan@gshan q]$ ./build/qemu-system-aarch64 -M sbsa-ref -cpu sa1100 qemu-system-aarch64: Invalid CPU model: sa1100 The valid models are: cortex-a57, cortex-a72, neoverse-n1, neoverse-v1, \ neoverse-n2, max [gshan@gshan q]$ ./build/qemu-system-aarch64 -M sbsa-ref -cpu host qemu-system-aarch64: unable to find CPU model 'host' Changelog ========= v8: * Pick r-bs from Phil (Gavin) * Drop @local_err and use @errp in machine_run_board_init() (Phil) * Add PATCH[v8 3/9] to improve is_cpu_type_supported() (Phil) * Use g_autofree and replace 'type' with 'model' for the error messages in is_cpu_type_supported() (Phil) v7: * Add 'return' after error_propagate() in machine_run_board_init() to avoid calling mc->init() in the failing case (Marcin) v6: * Drop PATCH[v5 01-23], queued by Phil (Phil) * Clearer hint if only one CPU type is supported and have 'const MachineState *' in is_cpu_type_supported() (Phil) * Move valid_cpu_types[] to board's class_init() function (Phil) Gavin Shan (9): machine: Use error handling when CPU type is checked machine: Introduce helper is_cpu_type_supported() machine: Improve is_cpu_type_supported() machine: Print CPU model name instead of CPU type hw/arm/virt: Hide host CPU model for tcg hw/arm/virt: Check CPU type in machine_run_board_init() hw/arm/sbsa-ref: Check CPU type in machine_run_board_init() hw/arm: Check CPU type in machine_run_board_init() hw/riscv/shakti_c: Check CPU type in machine_run_board_init() hw/arm/bananapi_m2u.c | 12 +++--- hw/arm/cubieboard.c | 12 +++--- hw/arm/mps2-tz.c | 26 +++++++++--- hw/arm/mps2.c | 26 +++++++++--- hw/arm/msf2-som.c | 12 +++--- hw/arm/musca.c | 12 +++--- hw/arm/npcm7xx_boards.c | 12 +++--- hw/arm/orangepi.c | 12 +++--- hw/arm/sbsa-ref.c | 36 +++++----------- hw/arm/virt.c | 60 +++++++++++---------------- hw/core/machine.c | 92 ++++++++++++++++++++++++----------------- hw/riscv/shakti_c.c | 13 +++--- 12 files changed, 168 insertions(+), 157 deletions(-) -- 2.42.0