From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed, 23 Oct 2013 16:42:15 +0000 (+0100)
Subject: nVMX: Fix pick-up of uninjected NMIs
X-Git-Tag: v3.13-rc1~80^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd2633c59b6f511effb53e10fa2c1e20b1cec1e7;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index feef3a1..81ce389 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) {