From f89959c3cafb6e9b1c023e590e6c17938b8f2099 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 26 Sep 2008 09:30:54 +0200 Subject: [PATCH] --- yaml --- r: 125179 b: refs/heads/master c: 26df99c6c5807115f06d4e1abae397b7f5f3e00c h: refs/heads/master i: 125177: 017ab03c88345f5de657eeb06c8bb8d297c68bff 125175: 46f6d84edfab4889fdedcfb00c1c5a1b76c0a9c1 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/lapic.c | 1 + trunk/virt/kvm/ioapic.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f871fe22985a..0c986c7f4884 100644 --- 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 index 206cc11a1c97..304f9ddbdd51 100644 --- 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 index 53772bb46320..c8f939c55075 100644 --- 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,