diff mbox series

[Xen-devel] xen/arm: Don't build GICv3 with the new vGIC

Message ID 20181019142355.10352-1-julien.grall@arm.com
State Accepted
Commit 62aa9e7f1b8ef64b8c7c1dacb1122351cb9fd132
Headers show
Series [Xen-devel] xen/arm: Don't build GICv3 with the new vGIC | expand

Commit Message

Julien Grall Oct. 19, 2018, 2:23 p.m. UTC
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>
---
 xen/arch/arm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefano Stabellini Oct. 19, 2018, 7:50 p.m. UTC | #1
On Fri, 19 Oct 2018, Julien Grall wrote:
> 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>

> ---
>  xen/arch/arm/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
> index c0e969e45a..581de67b6b 100644
> --- a/xen/arch/arm/Kconfig
> +++ b/xen/arch/arm/Kconfig
> @@ -40,7 +40,7 @@ config ACPI
>  
>  config GICV3
>  	bool "GICv3 driver"
> -	depends on ARM_64
> +	depends on ARM_64 && !NEW_VGIC
>  	default y
>  	---help---
>  
> -- 
> 2.11.0
>
diff mbox series

Patch

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index c0e969e45a..581de67b6b 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -40,7 +40,7 @@  config ACPI
 
 config GICV3
 	bool "GICv3 driver"
-	depends on ARM_64
+	depends on ARM_64 && !NEW_VGIC
 	default y
 	---help---