From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 27 Mar 2026 11:16:59 +0000 (+0000)
Subject: hw/arm/virt: Enable GICv5 CPU interface when using GICv5
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e42a0b7644905acc6c3c0b375519444e4b334eae;p=thirdparty%2Fqemu.git

hw/arm/virt: Enable GICv5 CPU interface when using GICv5

If we are using the GICv5 in the virt board, we need to set the
has_gcie property on the CPU objects to tell them to implement the
cpu interface part of GICv5.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
Message-id: 20260327111700.795099-65-peter.maydell@linaro.org
---

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 7da92e77469..75b20cfc9a1 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3017,6 +3017,14 @@ static void machvirt_init(MachineState *machine)
             object_property_set_bool(cpuobj, "lpa2", false, NULL);
         }
 
+        if (vms->gic_version == VIRT_GIC_VERSION_5) {
+            if (!object_property_find(cpuobj, "has_gcie")) {
+                error_report("Using GICv5 but guest CPU does not support it");
+                exit(1);
+            }
+            object_property_set_bool(cpuobj, "has_gcie", true, NULL);
+        }
+
         if (object_property_find(cpuobj, "reset-cbar")) {
             object_property_set_int(cpuobj, "reset-cbar",
                                     vms->memmap[VIRT_CPUPERIPHS].base,