OSDN Git Service

hw/arm/stm32f405: Report error when incorrect CPU is used
authorPhilippe Mathieu-Daudé <philmd@linaro.org>
Fri, 17 Nov 2023 07:17:02 +0000 (08:17 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 20 Nov 2023 15:30:59 +0000 (15:30 +0000)
commite1b72c55b1f7f77a976f9af7a6ccd437ec804916
treee7ea207142db51db62d78c575e17d2e75e73091d
parent790a4428f2e2a32944f3cefc4753ab3c71611453
hw/arm/stm32f405: Report error when incorrect CPU is used

Both 'netduinoplus2' and 'olimex-stm32-h405' machines ignore the
CPU type requested by the command line. This might confuse users,
since the following will create a machine with a Cortex-M4 CPU:

  $ qemu-system-aarch64 -M netduinoplus2 -cpu cortex-r5f

Set the MachineClass::valid_cpu_types field (introduced in commit
c9cf636d48 "machine: Add a valid_cpu_types property").
Remove the now unused MachineClass::default_cpu_type field.

We now get:

  $ qemu-system-aarch64 -M netduinoplus2 -cpu cortex-r5f
  qemu-system-aarch64: Invalid CPU type: cortex-r5f-arm-cpu
  The valid types are: cortex-m4-arm-cpu

Since the SoC family can only use Cortex-M4 CPUs, hard-code the
CPU type name at the SoC level, removing the QOM property
entirely.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-id: 20231117071704.35040-3-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/arm/netduinoplus2.c
hw/arm/olimex-stm32-h405.c
hw/arm/stm32f405_soc.c
include/hw/arm/stm32f405_soc.h