[Xen-changelog] [xen-unstable] x86 shadow: Relax assertion in VRAM tracking code

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1258958630 0
# Node ID 1bbc132675a29a030ba7b1ab4b5f6ade8087f94c
# Parent  5ea5cce3b9ada967029fcee19686c392fcf975fe
x86 shadow: Relax assertion in VRAM tracking code

The original assertion is too strict, as it includes the A/D bits of
the PTE, which (by design) can change under our feet.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/multi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 5ea5cce3b9ad -r 1bbc132675a2 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Mon Nov 23 06:42:12 2009 +0000
+++ b/xen/arch/x86/mm/shadow/multi.c    Mon Nov 23 06:43:50 2009 +0000
@@ -1117,7 +1117,8 @@ static inline void shadow_vram_put_l1e(s
             }
             else
             {
-                ASSERT(dirty_vram->sl1ma[i] == sl1ma);
+                ASSERT((dirty_vram->sl1ma[i] & PAGE_MASK) 
+                       == (sl1ma & PAGE_MASK));
                 dirty_vram->sl1ma[i] = INVALID_PADDR;
                 if ( flags & _PAGE_DIRTY )
                     dirty = 1;

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