[Xen-changelog] [xen-unstable] x86 shadow: Fix 2-on-3 mode.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1237300215 0
# Node ID 0e8005a9d81201f5224e8fd0690a8b787befc4c0
# Parent  6d5aa622fb3d696144ff7ea96636318946c560a8
x86 shadow: Fix 2-on-3 mode.

Signed-off-by: Gianluca Guida <Gianluca.Guida@xxxxxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/multi.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff -r 6d5aa622fb3d -r 0e8005a9d812 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Tue Mar 17 14:29:26 2009 +0000
+++ b/xen/arch/x86/mm/shadow/multi.c    Tue Mar 17 14:30:15 2009 +0000
@@ -2480,14 +2480,13 @@ int sh_safe_not_to_sync(struct vcpu *v, 
         return 0;
     smfn = _mfn(sp->up >> PAGE_SHIFT);
     ASSERT(mfn_valid(smfn));
-
-#if (GUEST_PAGING_LEVELS == 2)
+#endif
+
+#if (GUEST_PAGING_LEVELS == 2 && SHADOW_PAGING_LEVELS == 3)
     /* In 2-on-3 shadow mode the up pointer contains the link to the
      * shadow page, but the shadow_table contains only the first of the
      * four pages that makes the PAE top shadow tables. */
     smfn = _mfn(mfn_x(smfn) & ~0x3UL);
-#endif
-
 #endif
 
     if ( pagetable_get_pfn(v->arch.shadow_table[0]) == mfn_x(smfn)

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