From: Jan Kiszka <jan.kis...@siemens.com>
JAILHOUSE_BORROW_ROOT_PT and JAILHOUSE_BASE belong together logically,
and they used to be prior to 646233947717. Restore this by moving the
former also into asm/jailhouse_header.h. This is the expected location
for it because JAILHOUSE_BORROW_ROOT_PT is only relevant during the
setup process that jailhouse_header.h is used for.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
hypervisor/arch/arm/include/asm/jailhouse_header.h | 1 +
hypervisor/arch/x86/include/asm/jailhouse_header.h | 1 +
include/arch/arm/asm/jailhouse_hypercall.h | 2 --
include/arch/x86/asm/jailhouse_hypercall.h | 2 --
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/hypervisor/arch/arm/include/asm/jailhouse_header.h
b/hypervisor/arch/arm/include/asm/jailhouse_header.h
index 9a016409..eee94d3f 100644
--- a/hypervisor/arch/arm/include/asm/jailhouse_header.h
+++ b/hypervisor/arch/arm/include/asm/jailhouse_header.h
@@ -11,3 +11,4 @@
*/
#define JAILHOUSE_BASE 0xf0000000
+#define JAILHOUSE_BORROW_ROOT_PT 1
diff --git a/hypervisor/arch/x86/include/asm/jailhouse_header.h
b/hypervisor/arch/x86/include/asm/jailhouse_header.h
index 38b44501..8b76d4d4 100644
--- a/hypervisor/arch/x86/include/asm/jailhouse_header.h
+++ b/hypervisor/arch/x86/include/asm/jailhouse_header.h
@@ -17,3 +17,4 @@
#endif
#define JAILHOUSE_BASE __MAKE_UL(0xfffffffff0000000)
+#define JAILHOUSE_BORROW_ROOT_PT 1
diff --git a/include/arch/arm/asm/jailhouse_hypercall.h
b/include/arch/arm/asm/jailhouse_hypercall.h
index fac8e2df..8baec784 100644
--- a/include/arch/arm/asm/jailhouse_hypercall.h
+++ b/include/arch/arm/asm/jailhouse_hypercall.h
@@ -36,8 +36,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define JAILHOUSE_BORROW_ROOT_PT 1
-
#define JAILHOUSE_CALL_INS ".arch_extension virt\n\t" \
"hvc #0x4a48"
#define JAILHOUSE_CALL_NUM_RESULT "r0"
diff --git a/include/arch/x86/asm/jailhouse_hypercall.h
b/include/arch/x86/asm/jailhouse_hypercall.h
index 0f4782c2..3a52599f 100644
--- a/include/arch/x86/asm/jailhouse_hypercall.h
+++ b/include/arch/x86/asm/jailhouse_hypercall.h
@@ -36,8 +36,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#define JAILHOUSE_BORROW_ROOT_PT 1
-
/*
* As this is never called on a CPU without VM extensions,
* we assume that where VMCALL isn't available, VMMCALL is.
--
2.13.6
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
