# HG changeset patch
# User dkiper@xxxxxxxxxxxx
# Date 1266698140 -3600
# Node ID 0278998ea935b2bf4f503684ec5a352cf44660c8
# Parent  b4041e7bbe1b62fab4e3416bbab085b07af57809
Disable memory mapping warnings when stub domain is used.

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

diff -r b4041e7bbe1b -r 0278998ea935 xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c	Wed Feb 17 12:11:13 2010 +0000
+++ b/xen/arch/x86/mm/shadow/common.c	Sat Feb 20 21:35:40 2010 +0100
@@ -2607,9 +2607,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: "