qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gavin Shan <gshan@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, qemu-riscv@nongnu.org,
	peter.maydell@linaro.org, richard.henderson@linaro.org,
	imammedo@redhat.com, b.galvani@gmail.com,
	strahinja.p.jankovic@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 v6 4/8] hw/arm/virt: Hide host CPU model for tcg
Date: Mon, 20 Nov 2023 10:27:20 +1000	[thread overview]
Message-ID: <20231120002724.986326-5-gshan@redhat.com> (raw)
In-Reply-To: <20231120002724.986326-1-gshan@redhat.com>

The 'host' CPU model isn't available until KVM or HVF is enabled.
For example, the following error messages are seen when the guest
is started with option '-cpu cortex-a8' on tcg after the next commit
is applied to check the CPU type in machine_run_board_init().

  ERROR:../hw/core/machine.c:1423:is_cpu_type_supported: \
  assertion failed: (model != NULL)
  Bail out! ERROR:../hw/core/machine.c:1423:is_cpu_type_supported: \
  assertion failed: (model != NULL)
  Aborted (core dumped)

Hide 'host' CPU model until KVM or HVF is enabled. With this applied,
the valid CPU models can be shown.

  qemu-system-aarch64: Invalid CPU type: cortex-a8
  The valid types 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

Signed-off-by: Gavin Shan <gshan@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
 hw/arm/virt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index be2856c018..668c0d3194 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -220,7 +220,9 @@ static const char *valid_cpus[] = {
 #endif
     ARM_CPU_TYPE_NAME("cortex-a53"),
     ARM_CPU_TYPE_NAME("cortex-a57"),
+#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
     ARM_CPU_TYPE_NAME("host"),
+#endif
     ARM_CPU_TYPE_NAME("max"),
 };
 
-- 
2.41.0



  parent reply	other threads:[~2023-11-20  0:30 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-20  0:27 [PATCH v6 0/8] Unified CPU type check Gavin Shan
2023-11-20  0:27 ` [PATCH v6 1/8] machine: Use error handling when CPU type is checked Gavin Shan
2023-11-20  0:27 ` [PATCH v6 2/8] machine: Introduce helper is_cpu_type_supported() Gavin Shan
2023-11-20  0:27 ` [PATCH v6 3/8] machine: Print CPU model name instead of CPU type Gavin Shan
2023-11-20  0:27 ` Gavin Shan [this message]
2023-11-20  0:27 ` [PATCH v6 5/8] hw/arm/virt: Check CPU type in machine_run_board_init() Gavin Shan
2023-11-20  0:27 ` [PATCH v6 6/8] hw/arm/sbsa-ref: " Gavin Shan
2023-11-20  0:27 ` [PATCH v6 7/8] hw/arm: " Gavin Shan
2023-11-20  0:27 ` [PATCH v6 8/8] hw/riscv/shakti_c: " Gavin Shan
2023-11-20 19:42 ` [PATCH v6 0/8] Unified CPU type check Marcin Juszkiewicz
2023-11-21  0:34   ` 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=20231120002724.986326-5-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=richard.henderson@linaro.org \
    --cc=shan.gavin@gmail.com \
    --cc=strahinja.p.jankovic@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).