build: convert HAS_MEM_ACCESS use to Kconfig

Use the Kconfig generated CONFIG_HAS_MEM_ACCESS defines in the code base.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Razvan Cojocaru <rcojocaru@bitdefender.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/config/arm32.mk b/config/arm32.mk
index 001b2cd9c4f70e709cb5f39b5ec9972530662aa9..001e214b52471f45ac59d563d0cf345d8c5dcf90 100644 (file)
--- a/config/arm32.mk
+++ b/config/arm32.mk
@@ -9,8 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX :=
 # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
 CFLAGS += -marm
 
-HAS_MEM_ACCESS := y
-
 # Use only if calling $(LD) directly.
 LDFLAGS_DIRECT += -EL
 

diff --git a/config/arm64.mk b/config/arm64.mk
index 1b9a47f8964fdbfa93994c82803935e7308cbef7..4b8fdf669a5ac833acb6b50049c09c802d90c2a4 100644 (file)
--- a/config/arm64.mk
+++ b/config/arm64.mk
@@ -6,7 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX :=
 
 CFLAGS += #-marm -march= -mcpu= etc
 
-HAS_MEM_ACCESS := y
 HAS_GICV3 := y
 
 # Use only if calling $(LD) directly.

diff --git a/config/x86_32.mk b/config/x86_32.mk
index ed694470140d13a7444db153e04c44112d3732de..073819210ffbba79bf802dd859d7ccd0439440a5 100644 (file)
--- a/config/x86_32.mk
+++ b/config/x86_32.mk
@@ -5,7 +5,6 @@ CONFIG_X86_$(XEN_OS) := y
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y
 
-HAS_MEM_ACCESS := y
 HAS_MEM_PAGING := y
 HAS_MEM_SHARING := y
 

diff --git a/config/x86_64.mk b/config/x86_64.mk
index f74611fed1eecec7365894c8e8763cec623c3992..eabc634462c052c6cfe65b5403a4bdbc8adc1a94 100644 (file)
--- a/config/x86_64.mk
+++ b/config/x86_64.mk
@@ -6,7 +6,6 @@ CONFIG_COMPAT := y
 CONFIG_MIGRATE := y
 CONFIG_XCUTILS := y
 
-HAS_MEM_ACCESS := y
 HAS_MEM_PAGING := y
 HAS_MEM_SHARING := y
 

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 4ed0d11b118d81859d07fabbc4fcf8373cce688a..9e2cff6c6ce12cbca1c70ac36a42891f014f11a7 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -59,7 +59,6 @@ CFLAGS-$(crash_debug)   += -DCRASH_DEBUG
 CFLAGS-$(perfc)         += -DPERF_COUNTERS
 CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
-CFLAGS-$(HAS_MEM_ACCESS)  += -DHAS_MEM_ACCESS
 CFLAGS-$(HAS_MEM_PAGING)  += -DHAS_MEM_PAGING
 CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING
 CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index ec2406c6ba758db78fad14925c042670a4ad2ba9..ec176a6ed3f78a504528715f3dcefb2b65b385a4 100644 (file)
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -18,6 +18,7 @@ config ARM
        def_bool y
        select HAS_ARM_HDLCD
        select HAS_DEVICE_TREE
+       select HAS_MEM_ACCESS
        select HAS_PASSTHROUGH
        select HAS_PDX
        select HAS_VIDEO

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 393127df520aafe4af0795433b95f26444a61291..b7705c200bde5a383054d480d956958a13546ae1 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -9,6 +9,7 @@ config X86
        select HAS_GDBSX
        select HAS_IOPORTS
        select HAS_KEXEC
+       select HAS_MEM_ACCESS
        select HAS_NS16550
        select HAS_PASSTHROUGH
        select HAS_PCI

diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 8d2ab4f348747b7b8283e07bc58f7a190e9ba837..1193bbc5b7fe2992d650535ede4047b3c5f65625 100644 (file)
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -5,6 +5,10 @@ menu "Common Features"
 config HAS_DEVICE_TREE
        bool
 
+# Select HAS_MEM_ACCESS if mem access is supported
+config HAS_MEM_ACCESS
+       bool
+
 # Select HAS_PDX if PDX is supported
 config HAS_PDX
        bool

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 0acd2b0f73989bae94aa6a4863f4dea845febb2b..8ab15badf6f7b411a50902604130acbdc080e5e7 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_KEXEC) += kexec.o
 obj-$(CONFIG_KEXEC) += kimage.o
 obj-y += lib.o
 obj-y += lzo.o
-obj-$(HAS_MEM_ACCESS) += mem_access.o
+obj-$(CONFIG_HAS_MEM_ACCESS) += mem_access.o
 obj-y += memory.o
 obj-y += multicall.o
 obj-y += notifier.o

diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index 46b967e3c98d4cee076f13d0f9f4797e95997130..1fab587aec41dfcf68a095367425ea6df0dfe41c 100644 (file)
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -1130,7 +1130,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
         d->disable_migrate = op->u.disable_migrate.disable;
         break;
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
     case XEN_DOMCTL_set_access_required:
         if ( unlikely(current->domain == d) )
             ret = -EPERM;

diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c
index e1f95809619adcf1d67bec11e83ec5470553d9b8..0fe93dc09b2fc08bb215af67f5be693cdea40072 100644 (file)
--- a/xen/common/vm_event.c
+++ b/xen/common/vm_event.c
@@ -397,7 +397,7 @@ void vm_event_resume(struct domain *d, struct vm_event_domain *ved)
             vm_event_register_write_resume(v, &rsp);
             break;
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
         case VM_EVENT_REASON_MEM_ACCESS:
             mem_access_resume(v, &rsp);
             break;

diff --git a/xen/include/xen/mem_access.h b/xen/include/xen/mem_access.h
index 111f1feaffbfd19a6c6148c47496f1de16e41f82..272f1e470c3b65666f32732a18fd9fdc638a9c72 100644 (file)
--- a/xen/include/xen/mem_access.h
+++ b/xen/include/xen/mem_access.h
@@ -25,7 +25,7 @@
 #include <public/memory.h>
 #include <asm/p2m.h>
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
 
 int mem_access_memop(unsigned long cmd,
                      XEN_GUEST_HANDLE_PARAM(xen_mem_access_op_t) arg);

diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h
index 5e6ee7160705e05729084c8425b8d3a270208a88..bdc7d1b4bf5a02a50fee92c244f35ada90a76011 100644 (file)
--- a/xen/include/xsm/dummy.h
+++ b/xen/include/xsm/dummy.h
@@ -560,7 +560,7 @@ static XSM_INLINE int xsm_vm_event_control(XSM_DEFAULT_ARG struct domain *d, int
     return xsm_default_action(action, current->domain, d);
 }
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
 static XSM_INLINE int xsm_mem_access(XSM_DEFAULT_ARG struct domain *d)
 {
     XSM_ASSERT_ACTION(XSM_DM_PRIV);

diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 1dac834c3bc4399f68d0b66cd2658d6d3c7aa874..714b3bf91a0f62489318e4e3b32d2822cd380560 100644 (file)
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -152,7 +152,7 @@ struct xsm_operations {
 
     int (*vm_event_control) (struct domain *d, int mode, int op);
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
     int (*mem_access) (struct domain *d);
 #endif
 
@@ -604,7 +604,7 @@ static inline int xsm_vm_event_control (xsm_default_t def, struct domain *d, int
     return xsm_ops->vm_event_control(d, mode, op);
 }
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
 static inline int xsm_mem_access (xsm_default_t def, struct domain *d)
 {
     return xsm_ops->mem_access(d);

diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c
index 6f4101cd4392e1e0a4744ca7020f8fc4b0e61e37..ee4d6f38e7ea88bc9d2a21e53c993d4ff598f2d0 100644 (file)
--- a/xen/xsm/dummy.c
+++ b/xen/xsm/dummy.c
@@ -129,7 +129,7 @@ void xsm_fixup_ops (struct xsm_operations *ops)
 
     set_to_dummy_if_null(ops, vm_event_control);
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
     set_to_dummy_if_null(ops, mem_access);
 #endif
 

diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 454b0ceafb887d1d498716c079dd45edf0c7ebab..0102cc098cbf485e61f3ec97d49d1eb290fa4984 100644 (file)
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -1192,7 +1192,7 @@ static int flask_vm_event_control(struct domain *d, int mode, int op)
     return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__VM_EVENT);
 }
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
 static int flask_mem_access(struct domain *d)
 {
     return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_ACCESS);
@@ -1705,7 +1705,7 @@ static struct xsm_operations flask_ops = {
 
     .vm_event_control = flask_vm_event_control,
 
-#ifdef HAS_MEM_ACCESS
+#ifdef CONFIG_HAS_MEM_ACCESS
     .mem_access = flask_mem_access,
 #endif