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.
Note that the term "the registered CPU type name" used in this series
corresponds to the names of non-abstract CPU classes, regitered by
individual target.
PATCH[01-03] Come from Philippe Mathieu-Daudé. cpu_class_by_name()
is consolidated to ensure that the returned object
class isn't abstract and a child object class of
CPU_RESOLVING_TYPE
PATCH[04] Adds a generic helper cpu_model_from_type() to extract
the CPU model name from the CPU type name
PATCH[05-20] Uses cpu_model_from_type() in the individual target
PATCH[21-24] Implements cpu_list() for the missed targets
PATCH[25-33] Validates the CPU type in machine_run_board_init() for
the individual board
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
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
=========
v4:
* Rebase to latest v8.1.2 (Gavin)
* Integrate Philippe's patches where cpu_class_by_name()
is consolidated and my duplicate code is dropped (Philippe)
* Simplified changelog and improvements (Thomas)
* g_assert() on the return value from cpu_model_from_type()
in is_cpu_type_supported() (Philippe)
* Collected r-bs from Philippe Mathieu-Daudé, Leif Lindholm,
Bastian Koppelmann, Daniel Henrique Barboza, Cédric Le Goater,
Gavin Shan (Gavin)
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 (30):
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/hppa: Implement hppa_cpu_list()
target/microblaze: Implement microblaze_cpu_list()
target/nios2: Implement nios2_cpu_list()
cpu: 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()
Philippe Mathieu-Daudé (3):
target/alpha: Tidy up alpha_cpu_class_by_name()
hw/cpu: Call object_class_is_abstract() once in cpu_class_by_name()
cpu: Call object_class_dynamic_cast() once in cpu_class_by_name()
bsd-user/main.c | 3 -
cpu-target.c | 34 +++++++++-
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/cpu-common.c | 8 ---
hw/core/machine.c | 93 ++++++++++++++++-----------
hw/m68k/q800.c | 2 +-
hw/riscv/shakti_c.c | 11 ++--
include/hw/boards.h | 2 +-
include/hw/core/cpu.h | 19 +++++-
target/alpha/cpu.c | 15 ++---
target/arm/arm-qmp-cmds.c | 6 +-
target/arm/cpu.c | 5 +-
target/arm/helper.c | 12 ++--
target/avr/cpu.c | 17 +++--
target/cris/cpu.c | 12 ++--
target/hexagon/cpu.c | 17 ++---
target/hppa/cpu.c | 19 ++++++
target/hppa/cpu.h | 3 +
target/i386/cpu.c | 7 +-
target/loongarch/cpu.c | 14 ++--
target/loongarch/loongarch-qmp-cmds.c | 3 +-
target/m68k/cpu.c | 5 +-
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 | 18 ++++++
target/mips/sysemu/mips-qmp-cmds.c | 3 +-
target/nios2/cpu.c | 20 ++++++
target/nios2/cpu.h | 3 +
target/openrisc/cpu.c | 19 ++----
target/ppc/cpu_init.c | 12 ++--
target/riscv/cpu.c | 19 +++---
target/riscv/riscv-qmp-cmds.c | 3 +-
target/rx/cpu.c | 11 ++--
target/s390x/cpu_models.c | 12 ++--
target/s390x/cpu_models_sysemu.c | 9 ++-
target/sh4/cpu.c | 26 ++++----
target/tricore/cpu.c | 5 +-
target/tricore/helper.c | 13 ++--
target/xtensa/cpu.c | 5 +-
50 files changed, 384 insertions(+), 310 deletions(-)
--
2.41.0
