|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] build: convert HAS_MEM_PAGING use to Kconfig
commit c248338b7ab39265d84a527aa77eb2c2a6962b6b
Author: Doug Goldstein <cardoe@xxxxxxxxxx>
AuthorDate: Tue Dec 15 14:14:00 2015 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed Dec 16 17:54:31 2015 +0100
build: convert HAS_MEM_PAGING use to Kconfig
Use the Kconfig generated CONFIG_HAS_MEM_PAGING defines in the code base.
Signed-off-by: Doug Goldstein <cardoe@xxxxxxxxxx>
Acked-by: Razvan Cojocaru <rcojocaru@xxxxxxxxxxxxxxx>
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
config/x86_32.mk | 1 -
config/x86_64.mk | 1 -
xen/Rules.mk | 1 -
xen/arch/x86/Kconfig | 1 +
xen/common/Kconfig | 4 ++++
xen/common/memory.c | 2 +-
xen/common/vm_event.c | 8 ++++----
xen/include/xsm/dummy.h | 2 +-
xen/include/xsm/xsm.h | 4 ++--
xen/xsm/dummy.c | 2 +-
xen/xsm/flask/hooks.c | 4 ++--
11 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/config/x86_32.mk b/config/x86_32.mk
index 0738192..0fbc20d 100644
--- 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_PAGING := y
HAS_MEM_SHARING := y
CFLAGS += -m32 -march=i686
diff --git a/config/x86_64.mk b/config/x86_64.mk
index eabc634..b4b0163 100644
--- 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_PAGING := y
HAS_MEM_SHARING := y
CONFIG_XEN_INSTALL_SUFFIX := .gz
diff --git a/xen/Rules.mk b/xen/Rules.mk
index 9e2cff6..38c29b2 100644
--- 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_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/x86/Kconfig b/xen/arch/x86/Kconfig
index b7705c2..cca768b 100644
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -10,6 +10,7 @@ config X86
select HAS_IOPORTS
select HAS_KEXEC
select HAS_MEM_ACCESS
+ select HAS_MEM_PAGING
select HAS_NS16550
select HAS_PASSTHROUGH
select HAS_PCI
diff --git a/xen/common/Kconfig b/xen/common/Kconfig
index 1193bbc..946cca2 100644
--- a/xen/common/Kconfig
+++ b/xen/common/Kconfig
@@ -9,6 +9,10 @@ config HAS_DEVICE_TREE
config HAS_MEM_ACCESS
bool
+# Select HAS_MEM_PAGING if mem paging is supported
+config HAS_MEM_PAGING
+ bool
+
# Select HAS_PDX if PDX is supported
config HAS_PDX
bool
diff --git a/xen/common/memory.c b/xen/common/memory.c
index 6b3a755..bd8bf75 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -1323,7 +1323,7 @@ int prepare_ring_for_helper(
page = get_page_from_gfn(d, gmfn, &p2mt, P2M_UNSHARE);
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
if ( p2m_is_paging(p2mt) )
{
if ( page )
diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c
index 0fe93dc..2e59e41 100644
--- a/xen/common/vm_event.c
+++ b/xen/common/vm_event.c
@@ -403,7 +403,7 @@ void vm_event_resume(struct domain *d, struct
vm_event_domain *ved)
break;
#endif
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
case VM_EVENT_REASON_MEM_PAGING:
p2m_mem_paging_resume(d, &rsp);
break;
@@ -502,7 +502,7 @@ int __vm_event_claim_slot(struct domain *d, struct
vm_event_domain *ved,
return vm_event_grab_slot(ved, (current->domain != d));
}
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
/* Registered with Xen-bound event channel for incoming notifications. */
static void mem_paging_notification(struct vcpu *v, unsigned int port)
{
@@ -530,7 +530,7 @@ static void mem_sharing_notification(struct vcpu *v,
unsigned int port)
/* Clean up on domain destruction */
void vm_event_cleanup(struct domain *d)
{
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
if ( d->vm_event->paging.ring_page )
{
/* Destroying the wait queue head means waking up all
@@ -592,7 +592,7 @@ int vm_event_domctl(struct domain *d,
xen_domctl_vm_event_op_t *vec,
switch ( vec->mode )
{
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
case XEN_DOMCTL_VM_EVENT_OP_PAGING:
{
struct vm_event_domain *ved = &d->vm_event->paging;
diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h
index bdc7d1b..2825226 100644
--- a/xen/include/xsm/dummy.h
+++ b/xen/include/xsm/dummy.h
@@ -568,7 +568,7 @@ static XSM_INLINE int xsm_mem_access(XSM_DEFAULT_ARG struct
domain *d)
}
#endif
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
static XSM_INLINE int xsm_mem_paging(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 714b3bf..f24b7c3 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -156,7 +156,7 @@ struct xsm_operations {
int (*mem_access) (struct domain *d);
#endif
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
int (*mem_paging) (struct domain *d);
#endif
@@ -611,7 +611,7 @@ static inline int xsm_mem_access (xsm_default_t def, struct
domain *d)
}
#endif
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
static inline int xsm_mem_paging (xsm_default_t def, struct domain *d)
{
return xsm_ops->mem_paging(d);
diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c
index ee4d6f3..d061c5b 100644
--- a/xen/xsm/dummy.c
+++ b/xen/xsm/dummy.c
@@ -133,7 +133,7 @@ void xsm_fixup_ops (struct xsm_operations *ops)
set_to_dummy_if_null(ops, mem_access);
#endif
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
set_to_dummy_if_null(ops, mem_paging);
#endif
diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 0102cc0..52478ff 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -1199,7 +1199,7 @@ static int flask_mem_access(struct domain *d)
}
#endif
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
static int flask_mem_paging(struct domain *d)
{
return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_PAGING);
@@ -1709,7 +1709,7 @@ static struct xsm_operations flask_ops = {
.mem_access = flask_mem_access,
#endif
-#ifdef HAS_MEM_PAGING
+#ifdef CONFIG_HAS_MEM_PAGING
.mem_paging = flask_mem_paging,
#endif
--
generated by git-patchbot for /home/xen/git/xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |