diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-04-04 17:06:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-04-04 17:43:34 +0100 |
| commit | 04f2e3d54cf68637b4f1b3cbf6e0f60b3f33ff06 (patch) | |
| tree | e90186d9124cf7e368d3b2d51503f3ddc67aa055 | |
| parent | 58a8702f2c12fad0f994e1d55b7eae3a2b8120c4 (diff) | |
!fixup don't wire gicv2 VNMI NMItest-nmi
| -rw-r--r-- | hw/arm/virt.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 63d9f5b553..b132290d0d 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -884,10 +884,12 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) 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); |