commit 04f2e3d54cf68637b4f1b3cbf6e0f60b3f33ff06
author Peter Maydell <peter.maydell@linaro.org> Thu Apr 04 17:06:32 2024 +0100
committer Peter Maydell <peter.maydell@linaro.org> Thu Apr 04 17:43:34 2024 +0100
tree e90186d9124cf7e368d3b2d51503f3ddc67aa055
parent 58a8702f2c12fad0f994e1d55b7eae3a2b8120c4

!fixup don't wire gicv2 VNMI NMI

hw/arm/virt.c

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 63d9f5b..b132290 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -884,10 +884,12 @@
                            qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ));
         sysbus_connect_irq(gicbusdev, i + 3 * smp_cpus,
                            qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ));
-        sysbus_connect_irq(gicbusdev, i + 4 * smp_cpus,
-                           qdev_get_gpio_in(cpudev, ARM_CPU_NMI));
-        sysbus_connect_irq(gicbusdev, i + 5 * smp_cpus,
-                           qdev_get_gpio_in(cpudev, ARM_CPU_VINMI));
+        if (vms->gic_version != VIRT_GIC_VERSION_2) {
+            sysbus_connect_irq(gicbusdev, i + 4 * smp_cpus,
+                               qdev_get_gpio_in(cpudev, ARM_CPU_NMI));
+            sysbus_connect_irq(gicbusdev, i + 5 * smp_cpus,
+                               qdev_get_gpio_in(cpudev, ARM_CPU_VINMI));
+        }
     }
 
     fdt_add_gic_node(vms);