Make the tables from hvm/pagetables.S available to C code

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/include/arch/x86/page.h b/include/arch/x86/page.h
index f48171534d4889b12f560a7db8552490fd854fe8..7080ade520afdf1ac2ad99960755c323f07973f8 100644 (file)
--- a/include/arch/x86/page.h
+++ b/include/arch/x86/page.h
@@ -93,6 +93,19 @@ static inline uint64_t pte_to_paddr(intpte_t pte)
 
 #endif /* CONFIG_PAGING_LEVELS > 0 */
 
+#ifdef CONFIG_HVM
+
+extern uint64_t pae_l1_identmap[PAE_L1_PT_ENTRIES];
+extern uint64_t pae_l2_identmap[4 * PAE_L2_PT_ENTRIES];
+extern uint64_t pae_l3_identmap[PAE_L3_PT_ENTRIES];
+extern uint64_t pae_l4_identmap[PAE_L4_PT_ENTRIES];
+extern uint64_t pae32_l3_identmap[PAE32_L3_ENTRIES];
+
+extern uint32_t pse_l1_identmap[PSE_L1_PT_ENTRIES];
+extern uint32_t pse_l2_identmap[PSE_L2_PT_ENTRIES];
+
+#endif /* CONFIG_HVM */
+
 #endif /* !__ASSEMBLY__ */
 
 #endif /* XTF_X86_PAGE_H */

diff --git a/tests/invlpg/main.c b/tests/invlpg/main.c
index ddf6fae5c67700e9a784ef7d5805988ff4c21386..b23928820edefb9093e709b1222e575ef732b473 100644 (file)
--- a/tests/invlpg/main.c
+++ b/tests/invlpg/main.c
@@ -90,8 +90,6 @@
 #include <arch/x86/msr-index.h>
 #include <arch/x86/symbolic-const.h>
 
-extern uint64_t pae_l1_identmap[PAE_L1_PT_ENTRIES];
-
 /* Swizzle to easily change all invlpg instructions to being emulated. */
 #if 0
 #define _ASM_MAYBE_XEN_FEP _ASM_XEN_FEP