Change the naming scheme of hap_gva_to_gfn to match that of guest_walk_tables

(i.e. hap_gva_to_gfn_n_levels instead of hap_gva_to_gfn_nlevel)

Signed-off-by: Patrick Colp <Patrick.Colp@citrix.com>

diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c
index 0ad2ec837074bd4f2a4e811149ccefe2c8380d93..3ec97d492a4d81d53efea019d3bd453504a39dff 100644 (file)
--- a/xen/arch/x86/mm/hap/guest_walk.c
+++ b/xen/arch/x86/mm/hap/guest_walk.c
@@ -26,7 +26,7 @@
 #include <xen/sched.h>
 #include "private.h" /* for hap_gva_to_gfn_* */
 
-#define _hap_gva_to_gfn(levels) hap_gva_to_gfn_##levels##level
+#define _hap_gva_to_gfn(levels) hap_gva_to_gfn_##levels##_levels
 #define hap_gva_to_gfn(levels) _hap_gva_to_gfn(levels)
 
 #if GUEST_PAGING_LEVELS <= CONFIG_PAGING_LEVELS

diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c
index 823de713abd8dab94365e91c403063a1d146c63d..14b38a39ce0d56c1e893346b4f18a1e788c58cad 100644 (file)
--- a/xen/arch/x86/mm/hap/hap.c
+++ b/xen/arch/x86/mm/hap/hap.c
@@ -830,7 +830,7 @@ static const struct paging_mode hap_paging_real_mode = {
 static const struct paging_mode hap_paging_protected_mode = {
     .page_fault             = hap_page_fault,
     .invlpg                 = hap_invlpg,
-    .gva_to_gfn             = hap_gva_to_gfn_2level,
+    .gva_to_gfn             = hap_gva_to_gfn_2_levels,
     .update_cr3             = hap_update_cr3,
     .update_paging_modes    = hap_update_paging_modes,
     .write_p2m_entry        = hap_write_p2m_entry,
@@ -840,7 +840,7 @@ static const struct paging_mode hap_paging_protected_mode = {
 static const struct paging_mode hap_paging_pae_mode = {
     .page_fault             = hap_page_fault,
     .invlpg                 = hap_invlpg,
-    .gva_to_gfn             = hap_gva_to_gfn_3level,
+    .gva_to_gfn             = hap_gva_to_gfn_3_levels,
     .update_cr3             = hap_update_cr3,
     .update_paging_modes    = hap_update_paging_modes,
     .write_p2m_entry        = hap_write_p2m_entry,
@@ -850,7 +850,7 @@ static const struct paging_mode hap_paging_pae_mode = {
 static const struct paging_mode hap_paging_long_mode = {
     .page_fault             = hap_page_fault,
     .invlpg                 = hap_invlpg,
-    .gva_to_gfn             = hap_gva_to_gfn_4level,
+    .gva_to_gfn             = hap_gva_to_gfn_4_levels,
     .update_cr3             = hap_update_cr3,
     .update_paging_modes    = hap_update_paging_modes,
     .write_p2m_entry        = hap_write_p2m_entry,

diff --git a/xen/arch/x86/mm/hap/private.h b/xen/arch/x86/mm/hap/private.h
index 7b06e7df6340afa8d43028d1f6495db873ef85e4..cb51426f168c9fba8dafaa3f89bcb4b0fe1731f1 100644 (file)
--- a/xen/arch/x86/mm/hap/private.h
+++ b/xen/arch/x86/mm/hap/private.h
@@ -23,12 +23,12 @@
 /********************************************/
 /*          GUEST TRANSLATION FUNCS         */
 /********************************************/
-unsigned long hap_gva_to_gfn_2level(struct vcpu *v, unsigned long gva, 
-                                    uint32_t *pfec);
-unsigned long hap_gva_to_gfn_3level(struct vcpu *v, unsigned long gva,
-                                    uint32_t *pfec);
-unsigned long hap_gva_to_gfn_4level(struct vcpu *v, unsigned long gva,
-                                    uint32_t *pfec);
+unsigned long hap_gva_to_gfn_2_levels(struct vcpu *v, unsigned long gva, 
+                                     uint32_t *pfec);
+unsigned long hap_gva_to_gfn_3_levels(struct vcpu *v, unsigned long gva,
+                                     uint32_t *pfec);
+unsigned long hap_gva_to_gfn_4_levels(struct vcpu *v, unsigned long gva,
+                                     uint32_t *pfec);
 
 
 #endif /* __SVM_NPT_H__ */