[Xen-changelog] Small shadow pagetable fixes.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID c7006e46cd06b744a2efa6ba2a80e6355b8a2e97
# Parent  47ba7a4bed45ff5fa62490fb6954f6cd97ade691
Small shadow pagetable fixes.

Signed-off-by: Jun Nakajima <jun.nakajima@xxxxxxxxx>
Signed-off-by: Xin B Li <xin.b.li@xxxxxxxxx>

diff -r 47ba7a4bed45 -r c7006e46cd06 xen/arch/x86/shadow.c
--- a/xen/arch/x86/shadow.c     Sun Oct 30 14:42:02 2005
+++ b/xen/arch/x86/shadow.c     Sun Oct 30 15:40:05 2005
@@ -1381,7 +1381,8 @@
             perfc_incrc(resync_l1);
             perfc_incr_histo(wpt_updates, changed, PT_UPDATES);
             perfc_incr_histo(l1_entries_checked, max_shadow - min_shadow + 1, 
PT_UPDATES);
-            if (unshadow_l1) {
+            if ( d->arch.ops->guest_paging_levels == PAGING_L4 &&
+                 unshadow_l1 ) {
                 pgentry_64_t l2e;
 
                 __shadow_get_l2e(entry->v, entry->va, &l2e);
diff -r 47ba7a4bed45 -r c7006e46cd06 xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h      Sun Oct 30 14:42:02 2005
+++ b/xen/include/asm-x86/shadow.h      Sun Oct 30 15:40:05 2005
@@ -387,7 +387,7 @@
     nl1e = l1e;
     l1e_remove_flags(nl1e, _PAGE_GLOBAL);
 
-    if ( unlikely(l1e_get_flags(l1e) & L1_DISALLOW_MASK) )
+    if ( unlikely(l1e_get_flags(nl1e) & L1_DISALLOW_MASK) )
         return 0;
 
     res = get_page_from_l1e(nl1e, d);

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