[Xen-changelog] [xen-unstable] x86, hvm: Only warn on memory attribute conflicts for real RAM.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1225880711 0
# Node ID baad1475f2cd316f05c609ffb2866e064689bb2f
# Parent  ef202be3cf54e27cef7427739c5458435ec085f8
x86, hvm: Only warn on memory attribute conflicts for real RAM.

From: Disheng Su <disheng.su@xxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/mtrr.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff -r ef202be3cf54 -r baad1475f2cd xen/arch/x86/hvm/mtrr.c
--- a/xen/arch/x86/hvm/mtrr.c   Wed Nov 05 10:23:26 2008 +0000
+++ b/xen/arch/x86/hvm/mtrr.c   Wed Nov 05 10:25:11 2008 +0000
@@ -392,12 +392,13 @@ uint32_t get_pat_flags(struct vcpu *v,
      */
     if ( pat_entry_value == INVALID_MEM_TYPE )
     {
-        gdprintk(XENLOG_WARNING,
-                 "Conflict occurs for a given guest l1e flags:%x "
-                 "at %"PRIx64" (the effective mm type:%d), "
-                 "because the host mtrr type is:%d\n",
-                 gl1e_flags, (uint64_t)gpaddr, guest_eff_mm_type,
-                 shadow_mtrr_type);
+        if (mfn_valid(paddr_to_pfn(spaddr)))
+            gdprintk(XENLOG_WARNING,
+                    "Conflict occurs for a given guest l1e flags:%x "
+                    "at %"PRIx64" (the effective mm type:%d), "
+                    "because the host mtrr type is:%d\n",
+                    gl1e_flags, (uint64_t)gpaddr, guest_eff_mm_type,
+                    shadow_mtrr_type);
         pat_entry_value = PAT_TYPE_UNCACHABLE;
     }
     /* 4. Get the pte flags */

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