[PATCH 86/86] hw/arm/virt: allow virtualization=on with gicv5

[Peter Maydell]

Now that the GICv5 implementation supports virtualization, we can
remove the check in the virt board that prevented you from
using 'virtualization=on' with 'gic-version=x-5'.

Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
---
 hw/arm/virt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 9d192515d85..51554619fd5 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3015,9 +3015,8 @@ static void machvirt_init(MachineState *machine)
         exit(1);
     }
 
-    if ((vms->virt || vms->secure) &&
-        vms->gic_version == VIRT_GIC_VERSION_5) {
-        error_report("mach-virt: GICv5 currently supports EL1 only");
+    if (vms->secure && vms->gic_version == VIRT_GIC_VERSION_5) {
+        error_report("mach-virt: GICv5 currently supports EL1 and EL2 only");
         exit(1);
     }
 
-- 
2.43.0