aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm/vmx.c
diff options
context:
space:
mode:
authorLi, Xin B <xin.b.li@intel.com>2007-08-01 14:49:10 -0400
committerAvi Kivity <avi@qumranet.com>2007-10-13 04:18:23 -0400
commit1e4e6e00136b82a5595de903c28912afee1178cb (patch)
treecdbd7155de3754fafb0a20172a8e0aaec34e6bf5 /drivers/kvm/vmx.c
parenta477034750ce59df7fc17823f085df5a30e316f0 (diff)
KVM: VMX: Remove a duplicated ia32e mode vm entry control
Remove a duplicated ia32e mode VM Entry control definition and use the proper one. Signed-off-by: Xin Li <xin.b.li@intel.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/vmx.c')
-rw-r--r--drivers/kvm/vmx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 708055a50521..30c627d3b21d 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1111,7 +1111,7 @@ static void enter_lmode(struct kvm_vcpu *vcpu)
1111 find_msr_entry(to_vmx(vcpu), MSR_EFER)->data |= EFER_LMA | EFER_LME; 1111 find_msr_entry(to_vmx(vcpu), MSR_EFER)->data |= EFER_LMA | EFER_LME;
1112 vmcs_write32(VM_ENTRY_CONTROLS, 1112 vmcs_write32(VM_ENTRY_CONTROLS,
1113 vmcs_read32(VM_ENTRY_CONTROLS) 1113 vmcs_read32(VM_ENTRY_CONTROLS)
1114 | VM_ENTRY_CONTROLS_IA32E_MASK); 1114 | VM_ENTRY_IA32E_MODE);
1115} 1115}
1116 1116
1117static void exit_lmode(struct kvm_vcpu *vcpu) 1117static void exit_lmode(struct kvm_vcpu *vcpu)
@@ -1120,7 +1120,7 @@ static void exit_lmode(struct kvm_vcpu *vcpu)
1120 1120
1121 vmcs_write32(VM_ENTRY_CONTROLS, 1121 vmcs_write32(VM_ENTRY_CONTROLS,
1122 vmcs_read32(VM_ENTRY_CONTROLS) 1122 vmcs_read32(VM_ENTRY_CONTROLS)
1123 & ~VM_ENTRY_CONTROLS_IA32E_MASK); 1123 & ~VM_ENTRY_IA32E_MODE);
1124} 1124}
1125 1125
1126#endif 1126#endif
@@ -1185,13 +1185,13 @@ static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer)
1185 if (efer & EFER_LMA) { 1185 if (efer & EFER_LMA) {
1186 vmcs_write32(VM_ENTRY_CONTROLS, 1186 vmcs_write32(VM_ENTRY_CONTROLS,
1187 vmcs_read32(VM_ENTRY_CONTROLS) | 1187 vmcs_read32(VM_ENTRY_CONTROLS) |
1188 VM_ENTRY_CONTROLS_IA32E_MASK); 1188 VM_ENTRY_IA32E_MODE);
1189 msr->data = efer; 1189 msr->data = efer;
1190 1190
1191 } else { 1191 } else {
1192 vmcs_write32(VM_ENTRY_CONTROLS, 1192 vmcs_write32(VM_ENTRY_CONTROLS,
1193 vmcs_read32(VM_ENTRY_CONTROLS) & 1193 vmcs_read32(VM_ENTRY_CONTROLS) &
1194 ~VM_ENTRY_CONTROLS_IA32E_MASK); 1194 ~VM_ENTRY_IA32E_MODE);
1195 1195
1196 msr->data = efer & ~EFER_LME; 1196 msr->data = efer & ~EFER_LME;
1197 } 1197 }