diff options
author | Bandan Das <bsd@redhat.com> | 2014-04-19 18:17:46 -0400 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2014-04-22 17:41:34 -0400 |
commit | e0ba1a6ffcfe8dc95586943bbe56badb1459bf25 (patch) | |
tree | ab05c39577d1386956576ed68e478661391679c2 /arch/x86/kvm | |
parent | 77b0f5d67ff2781f36831cba79674c3e97bd7acf (diff) |
KVM: nVMX: Advertise support for interrupt acknowledgement
Some Type 1 hypervisors such as XEN won't enable VMX without it present
Signed-off-by: Bandan Das <bsd@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r-- | arch/x86/kvm/vmx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 4378014a41a9..72b8012991b9 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -2283,7 +2283,7 @@ static __init void nested_vmx_setup_ctls_msrs(void) | |||
2283 | rdmsr(MSR_IA32_VMX_EXIT_CTLS, | 2283 | rdmsr(MSR_IA32_VMX_EXIT_CTLS, |
2284 | nested_vmx_exit_ctls_low, nested_vmx_exit_ctls_high); | 2284 | nested_vmx_exit_ctls_low, nested_vmx_exit_ctls_high); |
2285 | nested_vmx_exit_ctls_low = VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR; | 2285 | nested_vmx_exit_ctls_low = VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR; |
2286 | /* Note that guest use of VM_EXIT_ACK_INTR_ON_EXIT is not supported. */ | 2286 | |
2287 | nested_vmx_exit_ctls_high &= | 2287 | nested_vmx_exit_ctls_high &= |
2288 | #ifdef CONFIG_X86_64 | 2288 | #ifdef CONFIG_X86_64 |
2289 | VM_EXIT_HOST_ADDR_SPACE_SIZE | | 2289 | VM_EXIT_HOST_ADDR_SPACE_SIZE | |
@@ -2291,7 +2291,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) | |||
2291 | VM_EXIT_LOAD_IA32_PAT | VM_EXIT_SAVE_IA32_PAT; | 2291 | VM_EXIT_LOAD_IA32_PAT | VM_EXIT_SAVE_IA32_PAT; |
2292 | nested_vmx_exit_ctls_high |= VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR | | 2292 | nested_vmx_exit_ctls_high |= VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR | |
2293 | VM_EXIT_LOAD_IA32_EFER | VM_EXIT_SAVE_IA32_EFER | | 2293 | VM_EXIT_LOAD_IA32_EFER | VM_EXIT_SAVE_IA32_EFER | |
2294 | VM_EXIT_SAVE_VMX_PREEMPTION_TIMER; | 2294 | VM_EXIT_SAVE_VMX_PREEMPTION_TIMER | VM_EXIT_ACK_INTR_ON_EXIT; |
2295 | |||
2295 | if (vmx_mpx_supported()) | 2296 | if (vmx_mpx_supported()) |
2296 | nested_vmx_exit_ctls_high |= VM_EXIT_CLEAR_BNDCFGS; | 2297 | nested_vmx_exit_ctls_high |= VM_EXIT_CLEAR_BNDCFGS; |
2297 | 2298 | ||