summaryrefslogtreecommitdiff
path: root/hw/misc
diff options
context:
space:
mode:
authorLadi Prosek <lprosek@redhat.com>2017-12-11 08:21:10 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2018-02-07 14:09:24 +0100
commita40227911c4cac4ac2551c57058d220baae4e91f (patch)
tree0975301d93622dcbc4460d3f2fb9ad91a33b79d3 /hw/misc
parent0b88dd942073e7e65f095551d60be5dc0c8e1413 (diff)
downloadqemu-a40227911c4cac4ac2551c57058d220baae4e91f.tar.gz
ivshmem: Disable irqfd on device reset
The effects of ivshmem_enable_irqfd() was not undone on device reset. This manifested as: ivshmem_add_kvm_msi_virq: Assertion `!s->msi_vectors[vector].pdev' failed. when irqfd was enabled before reset and then enabled again after reset, making ivshmem_enable_irqfd() run for the second time. To reproduce, run: ivshmem-server and QEMU with: -device ivshmem-doorbell,chardev=iv -chardev socket,path=/tmp/ivshmem_socket,id=iv then install the Windows driver, at the time of writing available at: https://github.com/virtio-win/kvm-guest-drivers-windows/tree/master/ivshmem and crash-reboot the guest by inducing a BSOD. Signed-off-by: Ladi Prosek <lprosek@redhat.com> Message-Id: <20171211072110.9058-5-lprosek@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/misc')
-rw-r--r--hw/misc/ivshmem.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index fe1d8d1669..16f03701b7 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -757,10 +757,14 @@ static void ivshmem_msix_vector_use(IVShmemState *s)
}
}
+static void ivshmem_disable_irqfd(IVShmemState *s);
+
static void ivshmem_reset(DeviceState *d)
{
IVShmemState *s = IVSHMEM_COMMON(d);
+ ivshmem_disable_irqfd(s);
+
s->intrstatus = 0;
s->intrmask = 0;
if (ivshmem_has_feature(s, IVSHMEM_MSI)) {