[Xen-changelog] [xen-unstable] x86: Fix caller of p2m_init(): cannot use paging_mode_hap() yet.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1270631847 -3600
# Node ID 3376c90960e83d9f1e34d51601a930290a128c09
# Parent  6c833a9ee3c49abf63bc40c63b6eee3dbcaa4ff4
x86: Fix caller of p2m_init(): cannot use paging_mode_hap() yet.

Signed-off-by: Dongxiao Xu <dongxiao.xu@xxxxxxxxx>
Acked-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
 xen/arch/x86/mm/p2m.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 6c833a9ee3c4 -r 3376c90960e8 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Wed Apr 07 08:17:21 2010 +0100
+++ b/xen/arch/x86/mm/p2m.c     Wed Apr 07 10:17:27 2010 +0100
@@ -1715,7 +1715,7 @@ int p2m_init(struct domain *d)
     p2m->get_entry_current = p2m_gfn_to_mfn_current;
     p2m->change_entry_type_global = p2m_change_type_global;
 
-    if ( is_hvm_domain(d) && paging_mode_hap(d) &&
+    if ( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled &&
          (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) )
         ept_p2m_init(d);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog