Re: [PATCH v2 3/3] x86: avoid building COMPAT code when !HVM && !PV32

[Jan Beulich <jbeulich@xxxxxxxx>]

On 06.04.2021 16:02, Jan Beulich wrote:
> --- a/xen/include/xen/compat.h
> +++ b/xen/include/xen/compat.h
> @@ -5,10 +5,11 @@
>  #ifndef __XEN_COMPAT_H__
>  #define __XEN_COMPAT_H__
>  
> -#ifdef CONFIG_COMPAT
> -
>  #include <xen/types.h>
>  #include <asm/compat.h>
> +
> +#ifdef CONFIG_COMPAT
> +
>  #include <compat/xlat.h>
>  
>  #define __DEFINE_COMPAT_HANDLE(name, type) \

As I've just noticed this breaks the Arm build, for the lack of
asm/compat.h there. I'll be folding in the hunks below; an alternative
would be to require every arch to have a (perhaps empty) compat.h,
which seems less desirable to me.

Jan

--- unstable.orig/xen/arch/x86/Kconfig
+++ unstable/xen/arch/x86/Kconfig
@@ -9,6 +9,7 @@ config X86
        select ARCH_SUPPORTS_INT128
        select CORE_PARKING
        select HAS_ALTERNATIVE
+       select HAS_COMPAT
        select HAS_CPUFREQ
        select HAS_EHCI
        select HAS_EX_TABLE
--- unstable.orig/xen/common/Kconfig
+++ unstable/xen/common/Kconfig
@@ -25,6 +25,9 @@ config GRANT_TABLE
 config HAS_ALTERNATIVE
        bool
 
+config HAS_COMPAT
+       bool
+
 config HAS_DEVICE_TREE
        bool
 
--- unstable.orig/xen/include/xen/compat.h
+++ unstable/xen/include/xen/compat.h
@@ -6,7 +6,9 @@
 #define __XEN_COMPAT_H__
 
 #include <xen/types.h>
+#ifdef CONFIG_HAS_COMPAT
 #include <asm/compat.h>
+#endif
 
 #ifdef CONFIG_COMPAT