qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gavin Shan <gshan@redhat.com>
To: qemu-arm@nongnu.org
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org,
	qemu-ppc@nongnu.org, imp@bsdimp.com, kevans@freebsd.org,
	richard.henderson@linaro.org, pbonzini@redhat.com,
	peter.maydell@linaro.org, imammedo@redhat.com, philmd@linaro.org,
	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,
	wangyanan55@huawei.com, laurent@vivier.eu, 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,
	mrolnik@gmail.com, edgar.iglesias@gmail.com, bcain@quicinc.com,
	gaosong@loongson.cn, aurelien@aurel32.net,
	jiaxun.yang@flygoat.com, aleksandar.rikalo@syrmia.com,
	chenhuacai@kernel.org, shorne@gmail.com, npiggin@gmail.com,
	clg@kaod.org, ysato@users.sourceforge.jp,
	kbastian@mail.uni-paderborn.de, jcmvbkbc@gmail.com,
	shan.gavin@gmail.com
Subject: [PATCH v5 00/31] Unified CPU type check
Date: Wed, 15 Nov 2023 09:55:57 +1000	[thread overview]
Message-ID: <20231114235628.534334-1-gshan@redhat.com> (raw)

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.

PATCH[01-04] consolidate CPUClass::class_by_name() so that the returned
             CPU class is checked for once in cpu_class_by_name()
PATCH[05]    add generic helper cpu_model_from_type() to extract the CPU
             model name from the CPU type name
PATCH[06]    add generic cpu_list(), to be reused by most of the targets
PATCH[07-21] switch to generic cpu_list() for most of the targets
PATCH[22]    use generic helper cpu_model_from_type() for several targets
PATCH[23-31] validate 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
v4: https://lists.nongnu.org/archive/html/qemu-arm/2023-11/msg00005.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
=========
v5:
  * PATCH[v5 01] to remove CPU class 'ev67' for alpha            (Ricard/Igor)
  * PATCH[v5 02] to remove object_class_is_abstract() for hppa   (Gavin)
  * Don't move cpu_class_by_name()                               (Richard)
  * PATCH[v5 04] to remove 'oc == NULL' since the check has
    been covered in object_class_dynamic_cast()                  (Igor)
  * Introduce generic cpu_list(), shared by most of the targets  (Richard)
  * Use g_str_has_suffix and g_auto_free                         (Richard)
  * Collect r-bs from Igor and Richard                           (Gavin)
v4:
  * 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):
  target/alpha: Remove 'ev67' CPU class
  target/hppa: Remove object_class_is_abstract()
  target: Remove 'oc == NULL' check
  cpu: Add helper cpu_model_from_type()
  cpu: Add generic cpu_list()
  target/alpha: Use generic cpu_list()
  target/arm: Use generic cpu_list()
  target/avr: Use generic cpu_list()
  target/cris: Use generic cpu_list()
  target/hexagon: Use generic cpu_list()
  target/hppa: Use generic cpu_list()
  target/loongarch: Use generic cpu_list()
  target/m68k: Use generic cpu_list()
  target/mips: Use generic cpu_list()
  target/openrisc: Use generic cpu_list()
  target/riscv: Use generic cpu_list()
  target/rx: Use generic cpu_list()
  target/sh4: Use generic cpu_list()
  target/tricore: Use generic cpu_list()
  target/xtensa: Use generic cpu_list()
  target: Use generic cpu_model_from_type()
  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: 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()

Philippe Mathieu-Daudé (1):
  cpu: Call object_class_dynamic_cast() once in cpu_class_by_name()

 bsd-user/main.c                       |  5 +-
 cpu-target.c                          | 44 ++++++++++++-
 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                 | 12 ++++
 target/alpha/cpu.c                    | 26 +-------
 target/alpha/cpu.h                    |  3 -
 target/arm/arm-qmp-cmds.c             |  3 +-
 target/arm/cpu.c                      |  4 +-
 target/arm/cpu.h                      |  3 -
 target/arm/helper.c                   | 46 -------------
 target/avr/cpu.c                      | 23 +------
 target/avr/cpu.h                      |  2 -
 target/cris/cpu.c                     | 42 +-----------
 target/cris/cpu.h                     |  3 -
 target/hexagon/cpu.c                  | 24 +------
 target/hexagon/cpu.h                  |  3 -
 target/hppa/cpu.c                     | 32 +--------
 target/hppa/cpu.h                     |  3 -
 target/i386/cpu.c                     |  3 +-
 target/loongarch/cpu.c                | 23 +------
 target/loongarch/cpu.h                |  4 --
 target/loongarch/loongarch-qmp-cmds.c |  3 +-
 target/m68k/cpu.c                     |  4 +-
 target/m68k/cpu.h                     |  4 --
 target/m68k/helper.c                  | 40 ------------
 target/mips/cpu-defs.c.inc            |  9 ---
 target/mips/cpu.h                     |  4 --
 target/mips/sysemu/mips-qmp-cmds.c    |  3 +-
 target/openrisc/cpu.c                 | 46 +------------
 target/openrisc/cpu.h                 |  3 -
 target/ppc/cpu_init.c                 |  3 +-
 target/ppc/ppc-qmp-cmds.c             |  3 +-
 target/riscv/cpu.c                    | 36 +----------
 target/riscv/cpu.h                    |  2 -
 target/riscv/riscv-qmp-cmds.c         |  3 +-
 target/rx/cpu.c                       | 20 +-----
 target/rx/cpu.h                       |  3 -
 target/sh4/cpu.c                      | 17 -----
 target/sh4/cpu.h                      |  3 -
 target/tricore/cpu.c                  |  4 +-
 target/tricore/cpu.h                  |  4 --
 target/tricore/helper.c               | 22 -------
 target/xtensa/cpu.c                   |  4 +-
 target/xtensa/cpu.h                   | 10 +--
 target/xtensa/helper.c                | 19 +-----
 target/xtensa/overlay_tool.h          |  7 +-
 60 files changed, 229 insertions(+), 634 deletions(-)

-- 
2.41.0



             reply	other threads:[~2023-11-14 23:58 UTC|newest]

Thread overview: 102+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-14 23:55 Gavin Shan [this message]
2023-11-14 23:55 ` [PATCH v5 01/31] target/alpha: Remove 'ev67' CPU class Gavin Shan
2023-11-15  0:22   ` Richard Henderson
2023-11-16  6:58     ` Philippe Mathieu-Daudé
2024-01-04 17:58   ` Philippe Mathieu-Daudé
2024-01-04 18:03     ` Philippe Mathieu-Daudé
2024-01-04 18:12       ` Philippe Mathieu-Daudé
2023-11-14 23:55 ` [PATCH v5 02/31] target/hppa: Remove object_class_is_abstract() Gavin Shan
2023-11-15  0:26   ` Richard Henderson
2023-11-15 11:18   ` BALATON Zoltan
2023-11-15 11:24     ` Gavin Shan
2023-11-15 11:27       ` BALATON Zoltan
2023-11-16  7:09   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 03/31] cpu: Call object_class_dynamic_cast() once in cpu_class_by_name() Gavin Shan
2023-11-15  0:30   ` Richard Henderson
2023-11-16 16:08   ` Philippe Mathieu-Daudé
2023-11-16 23:13     ` Gavin Shan
2023-11-14 23:56 ` [PATCH v5 04/31] target: Remove 'oc == NULL' check Gavin Shan
2023-11-15  0:34   ` Richard Henderson
2023-11-14 23:56 ` [PATCH v5 05/31] cpu: Add helper cpu_model_from_type() Gavin Shan
2023-11-15  0:35   ` Richard Henderson
2023-11-16  7:45   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 06/31] cpu: Add generic cpu_list() Gavin Shan
2023-11-15  0:37   ` Richard Henderson
2023-11-16  7:39   ` Philippe Mathieu-Daudé
2023-11-16  7:51     ` Philippe Mathieu-Daudé
2023-11-16 10:19       ` Philippe Mathieu-Daudé
2023-11-16 10:25         ` Philippe Mathieu-Daudé
2023-11-16 10:37           ` Gavin Shan
2023-11-16 10:34       ` Gavin Shan
2023-11-16 13:22         ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 07/31] target/alpha: Use " Gavin Shan
2023-11-15  0:38   ` Richard Henderson
2023-11-16  7:47   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 08/31] target/arm: " Gavin Shan
2023-11-15  0:41   ` Richard Henderson
2023-11-16  7:51   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 09/31] target/avr: " Gavin Shan
2023-11-15  0:42   ` Richard Henderson
2023-11-16  7:51   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 10/31] target/cris: " Gavin Shan
2023-11-15  0:44   ` Richard Henderson
2023-11-16  7:52   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 11/31] target/hexagon: " Gavin Shan
2023-11-15  0:46   ` Richard Henderson
2023-11-16  7:52   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 12/31] target/hppa: " Gavin Shan
2023-11-15  0:57   ` Richard Henderson
2023-11-16  7:52   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 13/31] target/loongarch: " Gavin Shan
2023-11-15  0:59   ` Richard Henderson
2023-11-16 10:27   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 14/31] target/m68k: " Gavin Shan
2023-11-15  1:01   ` Richard Henderson
2023-11-16 10:27   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 15/31] target/mips: " Gavin Shan
2023-11-15  1:02   ` Richard Henderson
2023-11-16  7:53   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 16/31] target/openrisc: " Gavin Shan
2023-11-15  1:04   ` Richard Henderson
2023-11-16 10:28   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 17/31] target/riscv: " Gavin Shan
2023-11-15  1:05   ` Richard Henderson
2023-11-16 10:28   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 18/31] target/rx: " Gavin Shan
2023-11-15  1:07   ` Richard Henderson
2023-11-16  7:54   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 19/31] target/sh4: " Gavin Shan
2023-11-15  1:08   ` Richard Henderson
2023-11-16  7:55   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 20/31] target/tricore: " Gavin Shan
2023-11-15  1:09   ` Richard Henderson
2023-11-16  7:55   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 21/31] target/xtensa: " Gavin Shan
2023-11-15  1:12   ` Richard Henderson
2023-11-16 13:29     ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 22/31] target: Use generic cpu_model_from_type() Gavin Shan
2023-11-15  1:17   ` Richard Henderson
2023-11-16 13:32   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 23/31] machine: Constify MachineClass::valid_cpu_types[i] Gavin Shan
2023-11-15  1:17   ` Richard Henderson
2023-11-16  9:52   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 24/31] machine: Use error handling when CPU type is checked Gavin Shan
2023-11-15  1:21   ` Richard Henderson
2023-11-15  1:26     ` Richard Henderson
2023-11-14 23:56 ` [PATCH v5 25/31] machine: Introduce helper is_cpu_type_supported() Gavin Shan
2023-11-16  9:33   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 26/31] machine: Print CPU model name instead of CPU type name Gavin Shan
2023-11-15  1:32   ` Richard Henderson
2023-11-14 23:56 ` [PATCH v5 27/31] hw/arm/virt: Hide host CPU model for tcg Gavin Shan
2023-11-14 23:56 ` [PATCH v5 28/31] hw/arm/virt: Check CPU type in machine_run_board_init() Gavin Shan
2023-11-14 23:56 ` [PATCH v5 29/31] hw/arm/sbsa-ref: " Gavin Shan
2023-11-14 23:56 ` [PATCH v5 30/31] hw/arm: " Gavin Shan
2023-11-16  8:35   ` Philippe Mathieu-Daudé
2023-11-14 23:56 ` [PATCH v5 31/31] hw/riscv/shakti_c: " Gavin Shan
2023-11-16 10:01 ` [PATCH v5 00/31] Unified CPU type check Philippe Mathieu-Daudé
2023-11-16 10:12   ` Gavin Shan
2023-11-16 13:35 ` Philippe Mathieu-Daudé
2023-11-16 16:20   ` Philippe Mathieu-Daudé
2023-11-16 23:26     ` Gavin Shan
2023-11-17  7:34       ` Philippe Mathieu-Daudé
2023-11-18  6:40         ` 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=20231114235628.534334-1-gshan@redhat.com \
    --to=gshan@redhat.com \
    --cc=aleksandar.rikalo@syrmia.com \
    --cc=alistair.francis@wdc.com \
    --cc=aurelien@aurel32.net \
    --cc=b.galvani@gmail.com \
    --cc=bcain@quicinc.com \
    --cc=bin.meng@windriver.com \
    --cc=chenhuacai@kernel.org \
    --cc=clg@kaod.org \
    --cc=dbarboza@ventanamicro.com \
    --cc=edgar.iglesias@gmail.com \
    --cc=eduardo@habkost.net \
    --cc=gaosong@loongson.cn \
    --cc=imammedo@redhat.com \
    --cc=imp@bsdimp.com \
    --cc=jcmvbkbc@gmail.com \
    --cc=jiaxun.yang@flygoat.com \
    --cc=kbastian@mail.uni-paderborn.de \
    --cc=kevans@freebsd.org \
    --cc=kfting@nuvoton.com \
    --cc=laurent@vivier.eu \
    --cc=liwei1518@gmail.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=marcin.juszkiewicz@linaro.org \
    --cc=mrolnik@gmail.com \
    --cc=nieklinnenbank@gmail.com \
    --cc=npiggin@gmail.com \
    --cc=palmer@dabbelt.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-riscv@nongnu.org \
    --cc=quic_llindhol@quicinc.com \
    --cc=rad@semihalf.com \
    --cc=richard.henderson@linaro.org \
    --cc=shan.gavin@gmail.com \
    --cc=shorne@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=ysato@users.sourceforge.jp \
    --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).