[Xen-changelog] [xen-4.0-testing] x86: Allow PV superpages to work with live migration

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1274269170 -3600
# Node ID 6c99e09a7cd59af4bfeee738d2f4f475aceb6107
# Parent  d3c420bf2a951d7f81a26f1ae4a179d20c723241
x86: Allow PV superpages to work with live migration

PV superpages currently do not work with live migration.  They fall
over dead when the shadow page table is enabled for dirty tracking.
The HVM support for superpages in this code has been tested and found
to work just fine for PV superpages.  This patch modifies the test
macro to allow the code to work with PV superpages.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   21409:2c0c08b4770f
xen-unstable date:        Tue May 18 11:24:04 2010 +0100
---
 xen/include/asm-x86/guest_pt.h |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff -r d3c420bf2a95 -r 6c99e09a7cd5 xen/include/asm-x86/guest_pt.h
--- a/xen/include/asm-x86/guest_pt.h    Wed May 19 12:39:08 2010 +0100
+++ b/xen/include/asm-x86/guest_pt.h    Wed May 19 12:39:30 2010 +0100
@@ -182,10 +182,11 @@ guest_supports_superpages(struct vcpu *v
     /* The _PAGE_PSE bit must be honoured in HVM guests, whenever
      * CR4.PSE is set or the guest is in PAE or long mode. 
      * It's also used in the dummy PT for vcpus with CR4.PG cleared. */
-    return (is_hvm_vcpu(v) && 
-            (GUEST_PAGING_LEVELS != 2 
-             || !hvm_paging_enabled(v)
-             || (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_PSE)));
+    return (!is_hvm_vcpu(v)
+            ? opt_allow_hugepage
+            : (GUEST_PAGING_LEVELS != 2 
+               || !hvm_paging_enabled(v)
+               || (v->arch.hvm_vcpu.guest_cr[4] & X86_CR4_PSE)));
 }
 
 static inline int

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