aboutsummaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2009-09-03 12:10:34 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-24 08:44:04 -0700
commitfc7a2de55c6ba0088d219a12f9825db54112e1a4 (patch)
tree15881fd149a3b9fbb8e846ed43f79e17de907bdc /virt
parent01e44f49de551da7ab12dab65eb9923bebf04be2 (diff)
downloadlinux-linaro-stable-fc7a2de55c6ba0088d219a12f9825db54112e1a4.tar.gz
KVM: Fix coalesced interrupt reporting in IOAPIC
commit 65a82211636f156a276cac3f8665605ae18f371f upstream. This bug was introduced by b4a2f5e723e4f7df467. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/ioapic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 1150c6d5c7b8..5f3980525191 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -188,6 +188,8 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level)
if ((edge && old_irr != ioapic->irr) ||
(!edge && !entry.fields.remote_irr))
ret = ioapic_service(ioapic, irq);
+ else
+ ret = 0; /* report coalesced interrupt */
}
}
return ret;