We move the macros (MAX|INVALID)_ALTP2M out of x86-related code to
common code, as the following patches will make use of them on ARM.
Signed-off-by: Sergej Proskurin <prosku...@sec.in.tum.de>
---
Cc: Andrew Cooper <andrew.coop...@citrix.com>
Cc: George Dunlap <george.dun...@eu.citrix.com>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
Cc: Jan Beulich <jbeul...@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Cc: Stefano Stabellini <sstabell...@kernel.org>
Cc: Tim Deegan <t...@xen.org>
Cc: Wei Liu <wei.l...@citrix.com>
Cc: Julien Grall <julien.gr...@arm.com>
---
v4: We have introduced this patch to our patch series.
---
xen/include/asm-arm/altp2m.h | 1 +
xen/include/asm-x86/domain.h | 3 +--
xen/include/xen/altp2m-common.h | 8 ++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 xen/include/xen/altp2m-common.h
diff --git a/xen/include/asm-arm/altp2m.h b/xen/include/asm-arm/altp2m.h
index 0711796123..66afa959f6 100644
--- a/xen/include/asm-arm/altp2m.h
+++ b/xen/include/asm-arm/altp2m.h
@@ -20,6 +20,7 @@
#ifndef __ASM_ARM_ALTP2M_H
#define __ASM_ARM_ALTP2M_H
+#include <xen/altp2m-common.h>
#include <xen/sched.h>
/* Alternate p2m on/off per domain */
diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index fb8bf17458..1d10f4b59f 100644
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -1,6 +1,7 @@
#ifndef __ASM_DOMAIN_H__
#define __ASM_DOMAIN_H__
+#include <xen/altp2m-common.h>
#include <xen/mm.h>
#include <xen/radix-tree.h>
#include <asm/hvm/vcpu.h>
@@ -234,8 +235,6 @@ struct paging_vcpu {
#define MAX_NESTEDP2M 10
-#define MAX_ALTP2M 10 /* arbitrary */
-#define INVALID_ALTP2M 0xffff
#define MAX_EPTP (PAGE_SIZE / sizeof(uint64_t))
struct p2m_domain;
struct time_scale {
diff --git a/xen/include/xen/altp2m-common.h b/xen/include/xen/altp2m-common.h
new file mode 100644
index 0000000000..670fb42292
--- /dev/null
+++ b/xen/include/xen/altp2m-common.h
@@ -0,0 +1,8 @@
+#ifndef __XEN_ALTP2M_COMMON_H__
+#define __XEN_ALTP2M_COMMON_H__
+
+#define MAX_ALTP2M 10 /* The system may contain an arbitrary number
+ of altp2m views. */
+#define INVALID_ALTP2M 0xffff
+
+#endif /* __XEN_ALTP2M_COMMON_H__ */
--
2.13.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
