diff options
| author | Jan Kiszka | 2013-10-23 18:43:09 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2013-10-28 13:14:38 +0100 |
| commit | a294c9bbd0dd0dea415a0ee5b8ee9c07f65f5496 (patch) | |
| tree | 51e8dbfa529861d373e8fe45d09f023c03e0eb42 /arch/x86/kvm | |
| parent | nVMX: Fix pick-up of uninjected NMIs (diff) | |
| download | kernel-qcow2-linux-a294c9bbd0dd0dea415a0ee5b8ee9c07f65f5496.tar.gz kernel-qcow2-linux-a294c9bbd0dd0dea415a0ee5b8ee9c07f65f5496.tar.xz kernel-qcow2-linux-a294c9bbd0dd0dea415a0ee5b8ee9c07f65f5496.zip | |
nVMX: Report CPU_BASED_VIRTUAL_NMI_PENDING as supported
If the host supports it, we can and should expose it to the guest as
well, just like we already do with PIN_BASED_VIRTUAL_NMIS.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 81ce3898b448..6850b0f1d52b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2228,7 +2228,8 @@ static __init void nested_vmx_setup_ctls_msrs(void) nested_vmx_procbased_ctls_low, nested_vmx_procbased_ctls_high); nested_vmx_procbased_ctls_low = 0; nested_vmx_procbased_ctls_high &= - CPU_BASED_VIRTUAL_INTR_PENDING | CPU_BASED_USE_TSC_OFFSETING | + CPU_BASED_VIRTUAL_INTR_PENDING | + CPU_BASED_VIRTUAL_NMI_PENDING | CPU_BASED_USE_TSC_OFFSETING | CPU_BASED_HLT_EXITING | CPU_BASED_INVLPG_EXITING | CPU_BASED_MWAIT_EXITING | CPU_BASED_CR3_LOAD_EXITING | CPU_BASED_CR3_STORE_EXITING | |