# HG changeset patch
# User dkiper@xxxxxxxxxxxx
# Date 1266696656 -3600
# Node ID eed20588492fb6c512cdd03f05a34035da0e2be0
# Parent  06911a6d4d3dc3f3b42ec57dcebb715ca15bbb6c
Disable memory mapping warnings when stub domain is used.

Signed-off-by: Daniel Kiper <dkiper@xxxxxxxxxxxx>

diff -r 06911a6d4d3d -r eed20588492f xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c	Wed Feb 17 12:16:23 2010 +0000
+++ b/xen/arch/x86/mm/shadow/common.c	Sat Feb 20 21:10:56 2010 +0100
@@ -2584,9 +2584,10 @@ int sh_remove_all_mappings(struct vcpu *
     {
         /* Don't complain if we're in HVM and there are some extra mappings: 
          * The qemu helper process has an untyped mapping of this dom's RAM 
-         * and the HVM restore program takes another. */
+         * and the HVM restore program takes another. Additionally, if stub domain
+	 * is active then it also has an untyped mapping of original dom's RAM. */
         if ( !(shadow_mode_external(v->domain)
-               && (page->count_info & PGC_count_mask) <= 3
+               && (page->count_info & PGC_count_mask) <= 4
                && (page->u.inuse.type_info & PGT_count_mask) == 0) )
         {
             SHADOW_ERROR("can't find all mappings of mfn %lx: "