Re: [PATCH v3 2/2] hw/arm/virt: Make accels in GIC finalize logic explicit

[Philippe Mathieu-Daudé]

On 11/1/23 14:35, Zenghui Yu wrote:
> Hi Alexander,
>
> On 2022/12/23 17:01, Alexander Graf wrote:
> > Let's explicitly list out all accelerators that we support when trying to
> > determine the supported set of GIC versions. KVM was already separate, so
> > the only missing one is HVF which simply reuses all of TCG's emulation
> > code and thus has the same compatibility matrix.
> >
> > Signed-off-by: Alexander Graf <agraf@csgraf.de>
> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > Reviewed-by: Cornelia Huck <cohuck@redhat.com>
>
>
> > @@ -1938,6 +1939,9 @@ static void 
> > finalize_gic_version(VirtMachineState *vms)
> >                  gics_supported |= VIRT_GIC_VERSION_4_MASK;
> >              }
> >          }
> > +    } else {
> > +        error_report("Unsupported accelerator, can not determine GIC 
> > support");
> > +        exit(1);
>
> Looks like qtest will use arguments like '-accel qtest' and a 'make
> check-qtest' triggers this error_report() on my box. It'd be good if you
> can have a look (as I really don't have much knowledge about qtest..).

Indeed, I had to squash:

-- >8 --
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 611f40c1da..b17e3dafa8 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -50,6 +50,7 @@
 #include "sysemu/tcg.h"
 #include "sysemu/kvm.h"
 #include "sysemu/hvf.h"
+#include "sysemu/qtest.h"
 #include "hw/loader.h"
 #include "qapi/error.h"
 #include "qemu/bitops.h"
@@ -1930,7 +1931,7 @@ static void finalize_gic_version(VirtMachineState 
*vms)
         /* KVM w/o kernel irqchip can only deal with GICv2 */
         gics_supported |= VIRT_GIC_VERSION_2_MASK;
         accel_name = "KVM with kernel-irqchip=off";
-    } else if (tcg_enabled() || hvf_enabled())  {
+    } else if (tcg_enabled() || hvf_enabled() || qtest_enabled())  {
         gics_supported |= VIRT_GIC_VERSION_2_MASK;
         if (module_object_class_by_name("arm-gicv3")) {
             gics_supported |= VIRT_GIC_VERSION_3_MASK;
---

Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>