[Xen-changelog] [xen-unstable] Revert 20505:44ea369eefc1

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1259235042 0
# Node ID a92e9fa2639d13f859c82a3ac255fb3c54226688
# Parent  8a0f156487b0c90a75474a38dd238c3e7b7aa630
Revert 20505:44ea369eefc1
---
 xen/arch/x86/mm/p2m.c           |    6 ------
 xen/arch/x86/mm/shadow/common.c |    7 -------
 2 files changed, 13 deletions(-)

diff -r 8a0f156487b0 -r a92e9fa2639d xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Thu Nov 26 11:24:50 2009 +0000
+++ b/xen/arch/x86/mm/p2m.c     Thu Nov 26 11:30:42 2009 +0000
@@ -1220,12 +1220,6 @@ p2m_gfn_to_mfn(struct domain *d, unsigne
     l1_pgentry_t *l1e;
 
     ASSERT(paging_mode_translate(d));
-
-    if ( unlikely(d->is_dying) )
-    {
-        *t = p2m_invalid;
-        return _mfn(INVALID_MFN);
-    }
 
     /* XXX This is for compatibility with the old model, where anything not 
      * XXX marked as RAM was considered to be emulated MMIO space.
diff -r 8a0f156487b0 -r a92e9fa2639d xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Thu Nov 26 11:24:50 2009 +0000
+++ b/xen/arch/x86/mm/shadow/common.c   Thu Nov 26 11:30:42 2009 +0000
@@ -2171,7 +2171,6 @@ static void hash_foreach(struct vcpu *v,
 
     /* Say we're here, to stop hash-lookups reordering the chains */
     ASSERT(shadow_locked_by_me(d));
-    ASSERT(d->arch.paging.shadow.hash_table);
     ASSERT(d->arch.paging.shadow.hash_walking == 0);
     d->arch.paging.shadow.hash_walking = 1;
 
@@ -3450,12 +3449,6 @@ shadow_write_p2m_entry(struct vcpu *v, u
     
     shadow_lock(d);
 
-    if ( unlikely(d->is_dying) )
-    {
-        shadow_unlock(d);
-        return;
-    }
-
     /* If we're removing an MFN from the p2m, remove it from the shadows too */
     if ( level == 1 )
     {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog