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().
PATCH[01] Adds a generic helper cpu_model_from_type() to convert CPU
type name to CPU model name.
PATCH[02-19] Uses cpu_model_from_type() in the individual targets
PATCH[20-23] Implements cpu_list() for the missed targets
PATCH[24-27] Improves the CPU type validation in machine_run_board_init()
PATCH[28-32] Validate 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
Testing
=======
With the following command lines, the output messages are varied before
and after the series is applied.
./build/qemu-system-aarch64 \
-accel tcg -machine virt,gic-version=3 \
-cpu cortex-a8 -smp maxcpus=2,cpus=1 \
:
Before the series is applied:
qemu-system-aarch64: mach-virt: CPU type cortex-a8-arm-cpu not supported
After the series is applied:
qemu-system-aarch64: Invalid CPU type: cortex-a8-arm-cpu
The valid models are: cortex-a7, cortex-a15, cortex-a35, cortex-a55,
cortex-a72, cortex-a76, a64fx, neoverse-n1,
neoverse-v1, cortex-a53, cortex-a57, max
Changelog
=========
v3:
* Generic helper cpu_model_from_type() (Igor)
* Apply cpu_model_from_type() to the individual targets (Igor)
* Implement cpu_list() for the missed targets (Gavin)
* Remove mc->valid_cpu_models (Richard)
* Separate patch to constify mc->validate_cpu_types (Gavin)
v2:
* Constify mc->valid_cpu_types (Richard)
* Print the supported CPU models, instead of typenames (Peter)
* Misc improvements for the hleper to do the check (Igor)
* More patches to move the check (Marcin)
Gavin Shan (32):
cpu: Add helper cpu_model_from_type()
target/alpha: Use generic helper to show CPU model names
target/arm: Use generic helper to show CPU model names
target/avr: Use generic helper to show CPU model names
target/cris: Use generic helper to show CPU model names
target/hexagon: Use generic helper to show CPU model names
target/i386: Use generic helper to show CPU model names
target/loongarch: Use generic helper to show CPU model names
target/m68k: Use generic helper to show CPU model names
target/mips: Use generic helper to show CPU model names
target/openrisc: Use generic helper to show CPU model names
target/ppc: Use generic helper to show CPU model names
target/riscv: Use generic helper to show CPU model names
target/rx: Use generic helper to show CPU model names
target/s390x: Use generic helper to show CPU model names
target/sh4: Use generic helper to show CPU model names
target/tricore: Use generic helper to show CPU model names
target/sparc: Improve sparc_cpu_class_by_name()
target/xtensa: Improve xtensa_cpu_class_by_name()
target/hppa: Implement hppa_cpu_list()
target/microblaze: Implement microblaze_cpu_list()
target/nios2: Implement nios2_cpu_list()
Mark cpu_list() supported on all targets
machine: Constify MachineClass::valid_cpu_types[i]
machine: Use error handling when CPU type is checked
machine: Introduce helper is_cpu_type_supported()
machine: Print CPU model name instead of CPU type name
hw/arm/virt: Check CPU type in machine_run_board_init()
hw/arm/virt: Hide host CPU model for tcg
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()
bsd-user/main.c | 3 -
cpu.c | 19 +++++-
hw/arm/bananapi_m2u.c | 12 ++--
hw/arm/cubieboard.c | 12 ++--
hw/arm/mps2-tz.c | 20 ++++--
hw/arm/mps2.c | 25 ++++++--
hw/arm/msf2-som.c | 12 ++--
hw/arm/musca.c | 13 ++--
hw/arm/npcm7xx_boards.c | 13 ++--
hw/arm/orangepi.c | 12 ++--
hw/arm/sbsa-ref.c | 21 +------
hw/arm/virt.c | 23 ++-----
hw/core/machine.c | 90 ++++++++++++++++-----------
hw/m68k/q800.c | 2 +-
hw/riscv/shakti_c.c | 11 ++--
include/hw/boards.h | 2 +-
include/hw/core/cpu.h | 12 ++++
target/alpha/cpu.c | 6 +-
target/arm/arm-qmp-cmds.c | 6 +-
target/arm/helper.c | 12 ++--
target/avr/cpu.c | 23 +++++--
target/cris/cpu.c | 7 +--
target/hexagon/cpu.c | 12 ++--
target/hppa/cpu.c | 19 ++++++
target/hppa/cpu.h | 3 +
target/i386/cpu.c | 7 +--
target/loongarch/cpu.c | 5 +-
target/loongarch/loongarch-qmp-cmds.c | 3 +-
target/m68k/helper.c | 14 ++---
target/microblaze/cpu.c | 20 ++++++
target/microblaze/cpu.h | 3 +
target/mips/cpu-defs.c.inc | 9 ---
target/mips/cpu.c | 25 +++++++-
target/mips/sysemu/mips-qmp-cmds.c | 3 +-
target/nios2/cpu.c | 20 ++++++
target/nios2/cpu.h | 3 +
target/openrisc/cpu.c | 23 +++----
target/ppc/cpu_init.c | 11 ++--
target/riscv/cpu.c | 23 ++++---
target/riscv/riscv-qmp-cmds.c | 3 +-
target/rx/cpu.c | 16 +++--
target/s390x/cpu_models.c | 18 +++---
target/s390x/cpu_models_sysemu.c | 9 ++-
target/sh4/cpu.c | 24 +++----
target/sparc/cpu.c | 7 ++-
target/tricore/cpu.c | 9 +--
target/tricore/helper.c | 13 ++--
target/xtensa/cpu.c | 9 +--
48 files changed, 397 insertions(+), 270 deletions(-)
--
2.41.0
