# HG changeset patch
# User dkiper@xxxxxxxxxxxx
# Date 1267443140 -3600
# Node ID 32d996d0c3f1acc6da8b0e9d742ca9e9a3bc2915
# Parent  c4301c2c727dc996ada3656c9105caeab92d9bdb
Revert C/S 20966 "Disable memory mapping warnings when stub domain is used."

It was ealier resolved by C/S 20720 and C/S 20751.
This fix was backported to xen-3.4-testing.

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

diff -r c4301c2c727d -r 32d996d0c3f1 xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c	Fri Feb 26 17:09:50 2010 +0000
+++ b/xen/arch/x86/mm/shadow/common.c	Mon Mar 01 12:32:20 2010 +0100
@@ -2607,11 +2607,9 @@ 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. Additionally, if stub
-         * domain is active then it also has an untyped mapping of original
-         * domain's RAM. */
+         * and the HVM restore program takes another. */
         if ( !(shadow_mode_external(v->domain)
-               && (page->count_info & PGC_count_mask) <= 4
+               && (page->count_info & PGC_count_mask) <= 3
                && (page->u.inuse.type_info & PGT_count_mask) == 0) )
         {
             SHADOW_ERROR("can't find all mappings of mfn %lx: "