[Xen-changelog] [xen-unstable] [XEN] Remove bogus assertion in shadow emulation path

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

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1170853087 0
# Node ID 584ab4fd1ad5de524ea3767e4a9bc1ea6bf6a30f
# Parent  4d7ee9f4336ab57706bcb477542611006ea33447
[XEN] Remove bogus assertion in shadow emulation path
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/multi.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff -r 4d7ee9f4336a -r 584ab4fd1ad5 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Wed Feb 07 12:41:46 2007 +0000
+++ b/xen/arch/x86/mm/shadow/multi.c    Wed Feb 07 12:58:07 2007 +0000
@@ -3875,11 +3875,9 @@ static inline void * emulate_map_dest(st
         goto page_fault;
     }
 
-    /* Attempted a write to a bad gfn? This should never happen:
-     * after all, we're here because this write is to a page table. */
-    BUG_ON(!mfn_valid(mfn));
-
-    ASSERT(sh_mfn_is_a_page_table(mfn));
+    if ( !mfn_valid(mfn) )
+        return NULL;
+
     *mfnp = mfn;
     return sh_map_domain_page(mfn) + (vaddr & ~PAGE_MASK);
 

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