diff options
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/vmx.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1ee811cef236..eec04129402f 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -1262,12 +1262,9 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) | |||
1262 | if (_cpu_based_2nd_exec_control & SECONDARY_EXEC_ENABLE_EPT) { | 1262 | if (_cpu_based_2nd_exec_control & SECONDARY_EXEC_ENABLE_EPT) { |
1263 | /* CR3 accesses and invlpg don't need to cause VM Exits when EPT | 1263 | /* CR3 accesses and invlpg don't need to cause VM Exits when EPT |
1264 | enabled */ | 1264 | enabled */ |
1265 | min &= ~(CPU_BASED_CR3_LOAD_EXITING | | 1265 | _cpu_based_exec_control &= ~(CPU_BASED_CR3_LOAD_EXITING | |
1266 | CPU_BASED_CR3_STORE_EXITING | | 1266 | CPU_BASED_CR3_STORE_EXITING | |
1267 | CPU_BASED_INVLPG_EXITING); | 1267 | CPU_BASED_INVLPG_EXITING); |
1268 | if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS, | ||
1269 | &_cpu_based_exec_control) < 0) | ||
1270 | return -EIO; | ||
1271 | rdmsr(MSR_IA32_VMX_EPT_VPID_CAP, | 1268 | rdmsr(MSR_IA32_VMX_EPT_VPID_CAP, |
1272 | vmx_capability.ept, vmx_capability.vpid); | 1269 | vmx_capability.ept, vmx_capability.vpid); |
1273 | } | 1270 | } |