From: Gavin Shan <gshan@redhat.com>
To: qemu-arm@nongnu.org
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org,
peter.maydell@linaro.org, imammedo@redhat.com,
b.galvani@gmail.com, strahinja.p.jankovic@gmail.com,
sundeep.lkml@gmail.com, kfting@nuvoton.com, wuhaotsh@google.com,
nieklinnenbank@gmail.com, rad@semihalf.com,
quic_llindhol@quicinc.com, marcin.juszkiewicz@linaro.org,
eduardo@habkost.net, marcel.apfelbaum@gmail.com,
philmd@linaro.org, wangyanan55@huawei.com, vijai@behindbytes.com,
palmer@dabbelt.com, alistair.francis@wdc.com,
bin.meng@windriver.com, liwei1518@gmail.com,
dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
shan.gavin@gmail.com
Subject: [PATCH v8 0/9] Unified CPU type check
Date: Wed, 29 Nov 2023 14:20:03 +1000 [thread overview]
Message-ID: <20231129042012.277831-1-gshan@redhat.com> (raw)
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:
git@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
next reply other threads:[~2023-11-29 4:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-29 4:20 Gavin Shan [this message]
2023-11-29 4:20 ` [PATCH v8 1/9] machine: Use error handling when CPU type is checked Gavin Shan
2023-11-29 8:20 ` Markus Armbruster
2023-12-01 3:33 ` Gavin Shan
2023-11-29 4:20 ` [PATCH v8 2/9] machine: Introduce helper is_cpu_type_supported() Gavin Shan
2023-12-01 10:53 ` Philippe Mathieu-Daudé
2023-12-03 23:13 ` Gavin Shan
2024-01-05 11:10 ` Philippe Mathieu-Daudé
2023-11-29 4:20 ` [PATCH v8 3/9] machine: Improve is_cpu_type_supported() Gavin Shan
2023-12-01 10:57 ` Philippe Mathieu-Daudé
2023-12-03 23:20 ` Gavin Shan
2023-12-03 23:30 ` Gavin Shan
2023-11-29 4:20 ` [PATCH v8 4/9] machine: Print CPU model name instead of CPU type Gavin Shan
2023-12-01 10:58 ` Philippe Mathieu-Daudé
2023-11-29 4:20 ` [PATCH v8 5/9] hw/arm/virt: Hide host CPU model for tcg Gavin Shan
2023-11-29 4:20 ` [PATCH v8 6/9] hw/arm/virt: Check CPU type in machine_run_board_init() Gavin Shan
2023-11-29 4:20 ` [PATCH v8 7/9] hw/arm/sbsa-ref: " Gavin Shan
2023-11-29 4:20 ` [PATCH v8 8/9] hw/arm: " Gavin Shan
2023-11-29 4:20 ` [PATCH v8 9/9] hw/riscv/shakti_c: " Gavin Shan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231129042012.277831-1-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=alistair.francis@wdc.com \
--cc=b.galvani@gmail.com \
--cc=bin.meng@windriver.com \
--cc=dbarboza@ventanamicro.com \
--cc=eduardo@habkost.net \
--cc=imammedo@redhat.com \
--cc=kfting@nuvoton.com \
--cc=liwei1518@gmail.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=marcin.juszkiewicz@linaro.org \
--cc=nieklinnenbank@gmail.com \
--cc=palmer@dabbelt.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=quic_llindhol@quicinc.com \
--cc=rad@semihalf.com \
--cc=shan.gavin@gmail.com \
--cc=strahinja.p.jankovic@gmail.com \
--cc=sundeep.lkml@gmail.com \
--cc=vijai@behindbytes.com \
--cc=wangyanan55@huawei.com \
--cc=wuhaotsh@google.com \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).