2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 1cd7138d492304a76f3b8ae89fc61e05b18205a7 Mon Sep 17 00:00:00 2001
|
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Sun, 1 Sep 2013 11:03:45 +0300
|
|
Subject: [PATCH] virtio_pci: fix level interrupts with irqfd
|
|
|
|
commit 62c96360ae7f2c7a8b029277fbb7cb082fdef7fd
|
|
virtio-pci: fix level interrupts
|
|
only helps systems without irqfd: on systems with irqfd support we
|
|
passed in flag requesting irqfd even when msix is disabled.
|
|
|
|
As a result, for level interrupts we didn't install an fd handler so
|
|
unmasking an fd had no effect.
|
|
|
|
Fix this up.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 23fe2b3f9e7df8da53ac1bc32c6875254911d7f4)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
hw/virtio/virtio-pci.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
|
|
index d37037e..41b96ce 100644
|
|
--- a/hw/virtio/virtio-pci.c
|
|
+++ b/hw/virtio/virtio-pci.c
|
|
@@ -799,8 +799,7 @@ static int virtio_pci_set_guest_notifiers(DeviceState *d, int nvqs, bool assign)
|
|
break;
|
|
}
|
|
|
|
- r = virtio_pci_set_guest_notifier(d, n, assign,
|
|
- kvm_msi_via_irqfd_enabled());
|
|
+ r = virtio_pci_set_guest_notifier(d, n, assign, with_irqfd);
|
|
if (r < 0) {
|
|
goto assign_error;
|
|
}
|