From ab3575f91307009ce8378a020e5dd974aa262484 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 7 Apr 2010 10:17:27 +0100 Subject: x86: Fix caller of p2m_init(): cannot use paging_mode_hap() yet. Signed-off-by: Dongxiao Xu Acked-by: Tim Deegan --- xen/arch/x86/mm/p2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index ba6f191d8b..53de2cf23b 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -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); -- cgit v1.2.3