[1/1] Disable GUEST_INTR_STATE_STI flag before injecting NMI to guest on VMX

Commit Message

Jes Sorensen Aug. 26, 2010, 8:06 p.m. UTC

None

Patch

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index cf56462..8e95371 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2888,6 +2888,8 @@  static void vmx_inject_nmi(struct kvm_vcpu *vcpu)
 		kvm_rip_write(vcpu, vmx->rmode.irq.rip - 1);
 		return;
 	}
+	vmcs_write32(GUEST_INTERRUPTIBILITY_INFO,
+			vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & ~GUEST_INTR_STATE_STI);
 	vmcs_write32(VM_ENTRY_INTR_INFO_FIELD,
 			INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK | NMI_VECTOR);
 }