summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-07-02 10:05:39 +0200
committerDoug Goldstein <cardoe@cardoe.com>2012-07-08 08:47:56 -0500
commit4d1980bf010667b08a2c6f5fd54d510e4d702137 (patch)
treeccf7bad2918d5d238c8e896e105b27b2cdb3dee2
parentqemu-kvm: Add missing default machine options (diff)
downloadqemu-kvm-1.1.0-gentoo.tar.gz
qemu-kvm-1.1.0-gentoo.tar.bz2
qemu-kvm-1.1.0-gentoo.zip
qemu-kvm: virtio: Do not register mask notifiers without in-kernel irqchip supportqemu-kvm-1.1.0-gentoo
We crash if we registers mask notifiers without backing in-kernel irqchip. This corresponds to the check in QEMU upstream after 1.1 now. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--hw/virtio-pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index a0c2ca74b..5b643561e 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -629,7 +629,7 @@ static int virtio_pci_set_guest_notifiers(void *opaque, bool assign)
/* Must unset mask notifier while guest notifier
* is still assigned */
- if (!assign) {
+ if (kvm_irqchip_in_kernel() && !assign) {
r = msix_unset_mask_notifier(&proxy->pci_dev);
assert(r >= 0);
}
@@ -647,7 +647,7 @@ static int virtio_pci_set_guest_notifiers(void *opaque, bool assign)
/* Must set mask notifier after guest notifier
* has been assigned */
- if (assign) {
+ if (kvm_irqchip_in_kernel() && assign) {
r = msix_set_mask_notifier(&proxy->pci_dev,
virtio_pci_mask_notifier);
if (r < 0) {