Re: [PATCH v4 30/33] hw/arm/virt: Hide host CPU model for tcg

2023-11-01 Thread Richard Henderson 

On 11/1/23 17:24, Gavin Shan wrote:

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.

   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 


This patch has to be sorted before the previous patch, for exactly this assert.
With that,

Reviewed-by: Richard Henderson 


r~

[PATCH v4 30/33] hw/arm/virt: Hide host CPU model for tcg

2023-11-01 Thread Gavin Shan 
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.

  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 
---
 hw/arm/virt.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 5bacd3a7f0..1ac2e29244 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -219,7 +219,9 @@ static const char * const valid_cpu_types[] = {
 #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"),
 NULL
 };
-- 
2.41.0