repository: /home/avi/kvm/linux-2.6
branch: master
commit 44a0469583ff93240acb76085a993a1d30202679
Author: Avi Kivity <[EMAIL PROTECTED]>
Date: Wed Sep 19 10:44:58 2007 +0200
KVM: VMX: Fix build on i386 due to EFER_LMA not defined
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 472763b..7f168ad 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -343,11 +343,17 @@ static void load_transition_efer(struct vcpu_vmx *vmx)
u64 guest_efer = vmx->guest_msrs[efer_offset].data;
u64 ignore_bits;
- /* NX is emulated; LMA and LME handled by hardware */
- ignore_bits = EFER_NX | EFER_LMA | EFER_LME;
- /* SCE is meaningless outside long mode */
- if (!(guest_efer & EFER_LMA))
- ignore_bits |= EFER_SCE;
+ /*
+ * NX is emulated; LMA and LME handled by hardware; SCE meaninless
+ * outside long mode
+ */
+ ignore_bits = EFER_NX | EFER_SCE;
+#ifdef CONFIG_X86_64
+ ignore_bits |= EFER_LMA | EFER_LME;
+ /* SCE is meaningful only in long mode on Intel */
+ if (guest_efer & EFER_LMA)
+ ignore_bits &= ~(u64)EFER_SCE;
+#endif
vmx->host_state.guest_efer_loaded
= (guest_efer & ~ignore_bits) != (host_efer & ~ignore_bits);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
