[Xen-changelog] [xen-3.2-testing] x86 vmx: Fix vmxassist=y build.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1202292395 0
# Node ID d26b1b777fde6dc841ee42adb791f0ab15c0e26c
# Parent  7f267c64c3d12723d5b846666e06139b9e47903a
x86 vmx: Fix vmxassist=y build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/vmx/vmx.c        |    2 ++
 xen/arch/x86/x86_32/asm-offsets.c |    2 ++
 xen/arch/x86/x86_64/asm-offsets.c |    2 ++
 3 files changed, 6 insertions(+)

diff -r 7f267c64c3d1 -r d26b1b777fde xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Wed Feb 06 09:59:53 2008 +0000
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Wed Feb 06 10:06:35 2008 +0000
@@ -1039,9 +1039,11 @@ static void vmx_update_guest_cr(struct v
             __vm_clear_bit(EXCEPTION_BITMAP, TRAP_no_device);
         }
 
+#ifndef VMXASSIST
         v->arch.hvm_vmx.vmxemul &= ~VMXEMUL_REALMODE;
         if ( !(v->arch.hvm_vcpu.guest_cr[0] & X86_CR0_PE) )
             v->arch.hvm_vmx.vmxemul |= VMXEMUL_REALMODE;
+#endif
 
         v->arch.hvm_vcpu.hw_cr[0] =
             v->arch.hvm_vcpu.guest_cr[0] |
diff -r 7f267c64c3d1 -r d26b1b777fde xen/arch/x86/x86_32/asm-offsets.c
--- a/xen/arch/x86/x86_32/asm-offsets.c Wed Feb 06 09:59:53 2008 +0000
+++ b/xen/arch/x86/x86_32/asm-offsets.c Wed Feb 06 10:06:35 2008 +0000
@@ -84,7 +84,9 @@ void __dummy__(void)
     BLANK();
 
     OFFSET(VCPU_vmx_launched, struct vcpu, arch.hvm_vmx.launched);
+#ifndef VMXASSIST
     OFFSET(VCPU_vmx_emul, struct vcpu, arch.hvm_vmx.vmxemul);
+#endif
     OFFSET(VCPU_hvm_guest_cr2, struct vcpu, arch.hvm_vcpu.guest_cr[2]);
     BLANK();
 
diff -r 7f267c64c3d1 -r d26b1b777fde xen/arch/x86/x86_64/asm-offsets.c
--- a/xen/arch/x86/x86_64/asm-offsets.c Wed Feb 06 09:59:53 2008 +0000
+++ b/xen/arch/x86/x86_64/asm-offsets.c Wed Feb 06 10:06:35 2008 +0000
@@ -103,7 +103,9 @@ void __dummy__(void)
     BLANK();
 
     OFFSET(VCPU_vmx_launched, struct vcpu, arch.hvm_vmx.launched);
+#ifndef VMXASSIST
     OFFSET(VCPU_vmx_emul, struct vcpu, arch.hvm_vmx.vmxemul);
+#endif
     OFFSET(VCPU_hvm_guest_cr2, struct vcpu, arch.hvm_vcpu.guest_cr[2]);
     BLANK();
 

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