In TCG mode, if gic-version=max we always select GICv3 even if CONFIG_ARM_GIC_TCG is unset. We shall rather select GICv2. This also brings the benefit of fixing qos tests errors for tests using gic-version=max with CONFIG_ARM_GIC_TCG unset.
Signed-off-by: Eric Auger <[email protected]> Fixes: a8a5546798c3 ("hw/intc/arm_gicv3: Introduce CONFIG_ARM_GIC_TCG Kconfig selector") --- hw/arm/virt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 141350bf21..2f1d4d0230 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1852,7 +1852,11 @@ static void finalize_gic_version(VirtMachineState *vms) vms->gic_version = VIRT_GIC_VERSION_2; break; case VIRT_GIC_VERSION_MAX: +#ifdef CONFIG_ARM_GIC_TCG vms->gic_version = VIRT_GIC_VERSION_3; +#else + vms->gic_version = VIRT_GIC_VERSION_2; +#endif break; case VIRT_GIC_VERSION_HOST: error_report("gic-version=host requires KVM"); -- 2.26.3
