[Xen-changelog] [xen-unstable] amd hvm (svm): Print warning if NPT constraints on PAE are hit.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1200498957 0
# Node ID f17b34df974f2c65fd10262a223e8246545802fc
# Parent  ec3f90599ab1cd7d25088fd5de411c8c4d75755a
amd hvm (svm): Print warning if NPT constraints on PAE are hit.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/mm/p2m.c            |    9 ++++++++-
 xen/include/asm-x86/hvm/domain.h |    4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff -r ec3f90599ab1 -r f17b34df974f xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Wed Jan 16 13:44:18 2008 +0000
+++ b/xen/arch/x86/mm/p2m.c     Wed Jan 16 15:55:57 2008 +0000
@@ -701,12 +701,19 @@ guest_physmap_add_entry(struct domain *d
         return -EINVAL;
 
 #if CONFIG_PAGING_LEVELS == 3
-    /* 32bit PAE nested paging does not support over 4GB guest due to 
+    /*
+     * 32bit PAE nested paging does not support over 4GB guest due to 
      * hardware translation limit. This limitation is checked by comparing
      * gfn with 0xfffffUL.
      */
     if ( paging_mode_hap(d) && (gfn > 0xfffffUL) )
+    {
+        if ( !test_and_set_bool(d->arch.hvm_domain.amd_npt_4gb_warning) )
+            dprintk(XENLOG_WARNING, "Dom%d failed to populate memory beyond"
+                    " 4GB: remove 'hap' Xen boot parameter.\n",
+                    d->domain_id);
         return -EINVAL;
+    }
 #endif
 
     p2m_lock(d);
diff -r ec3f90599ab1 -r f17b34df974f xen/include/asm-x86/hvm/domain.h
--- a/xen/include/asm-x86/hvm/domain.h  Wed Jan 16 13:44:18 2008 +0000
+++ b/xen/include/asm-x86/hvm/domain.h  Wed Jan 16 15:55:57 2008 +0000
@@ -73,6 +73,10 @@ struct hvm_domain {
 
     /* Pass-through */
     struct hvm_iommu       hvm_iommu;
+
+#if CONFIG_PAGING_LEVELS == 3
+    bool_t                 amd_npt_4gb_warning;
+#endif
 };
 
 #endif /* __ASM_X86_HVM_DOMAIN_H__ */

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