Commit 67d74e4c54 for qemu.org

commit 67d74e4c54236b53917edfa9f52efb4207064014
Author: Jinjie Ruan <ruanjinjie@huawei.com>
Date:   Fri Apr 19 14:33:01 2024 +0100

    hw/intc/arm_gicv3_kvm: Not set has-nmi=true for the KVM GICv3

    So far, there is no FEAT_GICv3_NMI support in the in-kernel GIC, so make it
    an error to try to set has-nmi=true for the KVM GICv3.

    Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
    Message-id: 20240407081733.3231820-15-ruanjinjie@huawei.com
    Suggested-by: Peter Maydell <peter.maydell@linaro.org>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
index 77eb37e131..00a383079b 100644
--- a/hw/intc/arm_gicv3_kvm.c
+++ b/hw/intc/arm_gicv3_kvm.c
@@ -805,6 +805,11 @@ static void kvm_arm_gicv3_realize(DeviceState *dev, Error **errp)
         return;
     }

+    if (s->nmi_support) {
+        error_setg(errp, "NMI is not supported with the in-kernel GIC");
+        return;
+    }
+
     gicv3_init_irqs_and_mmio(s, kvm_arm_gicv3_set_irq, NULL);

     for (i = 0; i < s->num_cpu; i++) {