From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 17 Dec 2009 06:27:55 +0000 (+0000)
Subject: Change the naming scheme of hap_gva_to_gfn to match that of guest_walk_tables
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12883
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=537cf0c1dc927a23c9c4380346972a41dbfbcadc;p=xen.git

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 0ad2ec8370..3ec97d492a 100644
--- 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 823de713ab..14b38a39ce 100644
--- 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 7b06e7df63..cb51426f16 100644
--- 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__ */