[PATCH] KVM: VMX: Fix pending NMI-vs.-IRQ race for user space irqchip

[Jan Kiszka]

Push b55a50582030cf294a675492d7ab2e235b965cc8 and
d3a2c20c9b850d92dae383fd6a64840de2687cd6 also to the user space irqchip
path.

Signed-off-by: Jan Kiszka <[EMAIL PROTECTED]>
---

 arch/x86/kvm/vmx.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 7ea4855..775a140 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2486,7 +2486,9 @@ static void do_interrupt_requests(struct kvm_vcpu *vcpu,
        vmx_update_window_states(vcpu);
 
        if (vcpu->arch.nmi_pending && !vcpu->arch.nmi_injected) {
-               if (vcpu->arch.nmi_window_open) {
+               if (vcpu->arch.interrupt.pending) {
+                       enable_nmi_window(vcpu);
+               } else if (vcpu->arch.nmi_window_open) {
                        vcpu->arch.nmi_pending = false;
                        vcpu->arch.nmi_injected = true;
                } else {
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html