# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1261031275 0
# Node ID 549c77a3f4c5bfa6ca06b654ac77e245fe33b9e3
# Parent da46574284b92a8882019c9ede2d04914a18423c
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@xxxxxxxxxx>
---
xen/arch/x86/mm/hap/guest_walk.c | 2 +-
xen/arch/x86/mm/hap/hap.c | 6 +++---
xen/arch/x86/mm/hap/private.h | 12 ++++++------
3 files changed, 10 insertions(+), 10 deletions(-)
diff -r da46574284b9 -r 549c77a3f4c5 xen/arch/x86/mm/hap/guest_walk.c
--- a/xen/arch/x86/mm/hap/guest_walk.c Thu Dec 17 06:27:55 2009 +0000
+++ b/xen/arch/x86/mm/hap/guest_walk.c Thu Dec 17 06:27:55 2009 +0000
@@ -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 -r da46574284b9 -r 549c77a3f4c5 xen/arch/x86/mm/hap/hap.c
--- a/xen/arch/x86/mm/hap/hap.c Thu Dec 17 06:27:55 2009 +0000
+++ b/xen/arch/x86/mm/hap/hap.c Thu Dec 17 06:27:55 2009 +0000
@@ -830,7 +830,7 @@ static const struct paging_mode hap_pagi
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_pagi
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_pagi
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 -r da46574284b9 -r 549c77a3f4c5 xen/arch/x86/mm/hap/private.h
--- a/xen/arch/x86/mm/hap/private.h Thu Dec 17 06:27:55 2009 +0000
+++ b/xen/arch/x86/mm/hap/private.h Thu Dec 17 06:27:55 2009 +0000
@@ -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__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home