xen/arm: Don't build GICv3 with the new vGIC

Commit 54ec59f6b0 "xen/arm: vgic-v3: Don't create empty re-distributor
regions" breaks compilation when using the new vGIC.

This is because the field nr_regions is not existing in the vgic
structure. For simplicity, as vGICv3 is not yet imported, disable GICv3.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
(cherry picked from commit 62aa9e7f1b8ef64b8c7c1dacb1122351cb9fd132)

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 8174c0c635d0baf7c44112d58b3cac1eb8053410..7803c98a7f94e5c226def60b522877251c2a6039 100644 (file)
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -12,7 +12,7 @@ config ARM_32
 config ARM_64
        def_bool y
        depends on 64BIT
-       select HAS_GICV3
+       select HAS_GICV3 if !NEW_VGIC
 
 config ARM
        def_bool y