x86/mm: move declaration of new_guest_cr3 to local pv/mm.h

It is only used by PV. The code can only be moved together with other
PV mm code.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c
index 6dec822237f9a884a73af7f7c5eaa71f0a4bd5ab..b5599c186993ccab0b57d0a694d1af5224488abd 100644 (file)
--- a/xen/arch/x86/pv/emul-priv-op.c
+++ b/xen/arch/x86/pv/emul-priv-op.c
@@ -41,6 +41,7 @@
 
 #include "../x86_64/mmconfig.h"
 #include "emulate.h"
+#include "mm.h"
 
 /* Override macros from asm/page.h to make them work with mfn_t */
 #undef mfn_to_page

diff --git a/xen/arch/x86/pv/mm.h b/xen/arch/x86/pv/mm.h
index 0d712461968850bf3042dbe6a0b98ddf866416c5..169c9e054801802d6d089fa6d07fabeeb2833171 100644 (file)
--- a/xen/arch/x86/pv/mm.h
+++ b/xen/arch/x86/pv/mm.h
@@ -6,6 +6,8 @@ l1_pgentry_t *map_guest_l1e(unsigned long linear, mfn_t *gl1mfn);
 void init_guest_l4_table(l4_pgentry_t l4tab[], const struct domain *d,
                          bool zap_ro_mpt);
 
+int new_guest_cr3(mfn_t mfn);
+
 /* Read a PV guest's l1e that maps this linear address. */
 static inline l1_pgentry_t guest_get_eff_l1e(unsigned long linear)
 {

diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index e5087e11e5f18345df5621f06d8bb38f1bdd3f02..f2e0f498c43ee28d0d70b5e292fa2af536ed6e29 100644 (file)
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -546,7 +546,6 @@ void audit_domains(void);
 
 #endif
 
-int new_guest_cr3(mfn_t mfn);
 void make_cr3(struct vcpu *v, mfn_t mfn);
 void update_cr3(struct vcpu *v);
 int vcpu_destroy_pagetables(struct vcpu *);