# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1205852623 0
# Node ID 64b19db801b6ab63588e8fc767aa9c57bfc5a4aa
# Parent  c978ecfc4f41a1dced268ff31f377156d392aaf2
p2m: hap enabled/supported fix

Check for per domain hap_enabled rather than hvm_funcs hap_supported,
in case hap has been disabled.

Alleviates problem booting >=4Gig shadow HVM guests on PAE hypervisor
on AMD-V platforms.

Signed-off-by: Tom Woller <thomas.woller@amd.com>

Index: xen-3.2.1-testing/xen/arch/x86/mm/p2m.c
===================================================================
--- xen-3.2.1-testing.orig/xen/arch/x86/mm/p2m.c
+++ xen-3.2.1-testing/xen/arch/x86/mm/p2m.c
@@ -229,7 +229,7 @@ set_p2m_entry(struct domain *d, unsigned
     if ( !p2m_next_level(d, &table_mfn, &table, &gfn_remainder, gfn,
                          L3_PAGETABLE_SHIFT - PAGE_SHIFT,
                          ((CONFIG_PAGING_LEVELS == 3)
-                          ? (hvm_funcs.hap_supported ? 4 : 8)
+                          ? (d->arch.hvm_domain.hap_enabled ? 4 : 8)
                           : L3_PAGETABLE_ENTRIES),
                          PGT_l2_page_table) )
         goto out;