diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-03-01 12:00:11 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-03-01 12:00:11 +0000 |
| commit | da1a6632f5de3f9c711052882f2a918d0c2bdb47 (patch) | |
| tree | ddde107ab824b8e5c230eb887421e0aacfc39546 | |
| parent | b1c29c92ae99e9e95651c9ef8d1672cdc952cc7f (diff) | |
| download | xen-da1a6632f5de3f9c711052882f2a918d0c2bdb47.tar.gz xen-da1a6632f5de3f9c711052882f2a918d0c2bdb47.tar.bz2 xen-da1a6632f5de3f9c711052882f2a918d0c2bdb47.zip | |
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@net-space.pl>
| -rw-r--r-- | xen/arch/x86/mm/shadow/common.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index adb7396d86..5e37bb01d4 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2607,11 +2607,9 @@ 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. 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: " |