aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2010-02-22 18:46:09 +0000
committerKeir Fraser <keir.fraser@citrix.com>2010-02-22 18:46:09 +0000
commit9a6ad742e65e08f7b772683581288847c6a69885 (patch)
tree630b29e0afd0661abfca1cbc8dbee1775e81ad15
parent022cf55cf1bfd7a8aa08f19a3734f36154050859 (diff)
downloadxen-9a6ad742e65e08f7b772683581288847c6a69885.tar.gz
xen-9a6ad742e65e08f7b772683581288847c6a69885.tar.bz2
xen-9a6ad742e65e08f7b772683581288847c6a69885.zip
Disable memory mapping warnings when stub domain is used.
Signed-off-by: Daniel Kiper <dkiper@net-space.pl>
-rw-r--r--xen/arch/x86/mm/shadow/common.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index 5e37bb01d4..adb7396d86 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2607,9 +2607,11 @@ int sh_remove_all_mappings(struct vcpu *v, mfn_t gmfn)
{
/* 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
+ * domain'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: "