---

yaml --- r: 125179 b: refs/heads/master c: 26df99c h: refs/heads/master i: 125177: 017ab03 125175: 46f6d84 v: v3
git-mirror · Dec 31, 2008 · f89959c · f89959c
1 parent c5138f7
commit f89959c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0496fbb973ccc9477082e859ed0faab5acb805ba
+refs/heads/master: 26df99c6c5807115f06d4e1abae397b7f5f3e00c
diff --git a/trunk/arch/x86/kvm/lapic.c b/trunk/arch/x86/kvm/lapic.c
@@ -354,6 +354,7 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,
 
 	case APIC_DM_NMI:
 		kvm_inject_nmi(vcpu);
+		kvm_vcpu_kick(vcpu);
 		break;
 
 	case APIC_DM_INIT:

diff --git a/trunk/virt/kvm/ioapic.c b/trunk/virt/kvm/ioapic.c
@@ -150,6 +150,7 @@ static int ioapic_inj_irq(struct kvm_ioapic *ioapic,
 static void ioapic_inj_nmi(struct kvm_vcpu *vcpu)
 {
 	kvm_inject_nmi(vcpu);
+	kvm_vcpu_kick(vcpu);
 }
 
 static u32 ioapic_get_delivery_bitmask(struct kvm_ioapic *ioapic, u8 dest,