diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2013-10-23 18:42:15 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-10-28 13:14:24 +0100 |
| commit | cd2633c59b6f511effb53e10fa2c1e20b1cec1e7 (patch) | |
| tree | fb2422944dcfa2876ea27453ea0530209d3aa651 /arch/x86 | |
| parent | KVM: nVMX: Report 2MB EPT pages as supported (diff) | |
| download | linux-cd2633c59b6f511effb53e10fa2c1e20b1cec1e7.tar.xz linux-cd2633c59b6f511effb53e10fa2c1e20b1cec1e7.zip | |
nVMX: Fix pick-up of uninjected NMIs
__vmx_complete_interrupts stored uninjected NMIs in arch.nmi_injected,
not arch.nmi_pending. So we actually need to check the former field in
vmcs12_save_pending_event. This fixes the eventinj unit test when run
in nested KVM.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index feef3a1e45d3..81ce3898b448 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8078,7 +8078,7 @@ static void vmcs12_save_pending_event(struct kvm_vcpu *vcpu, } vmcs12->idt_vectoring_info_field = idt_vectoring; - } else if (vcpu->arch.nmi_pending) { + } else if (vcpu->arch.nmi_injected) { vmcs12->idt_vectoring_info_field = INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR; } else if (vcpu->arch.interrupt.pending) { |