[Xen-changelog] [xen-unstable] hvm: Fix %cr4 handling in HAP paging mode.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1186575487 -3600
# Node ID 00aa18fd722ec1a3c1255e06ab601cde809a7855
# Parent  35337d5c83f99daaf3c23c96c980bdc3b1243f8d
hvm: Fix %cr4 handling in HAP paging mode.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/hvm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 35337d5c83f9 -r 00aa18fd722e xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Wed Aug 08 12:27:23 2007 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Wed Aug 08 13:18:07 2007 +0100
@@ -585,9 +585,10 @@ int hvm_set_cr4(unsigned long value)
 
     old_cr = v->arch.hvm_vcpu.guest_cr[4];
     v->arch.hvm_vcpu.guest_cr[4] = value;
-    v->arch.hvm_vcpu.hw_cr[4] = value | HVM_CR4_HOST_MASK;
+    v->arch.hvm_vcpu.hw_cr[4] = HVM_CR4_HOST_MASK;
     if ( paging_mode_hap(v->domain) )
         v->arch.hvm_vcpu.hw_cr[4] &= ~X86_CR4_PAE;
+    v->arch.hvm_vcpu.hw_cr[4] |= value;
     hvm_update_guest_cr(v, 4);
   
     /* Modifying CR4.{PSE,PAE,PGE} invalidates all TLB entries, inc. Global. */

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