[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/30] virtio-pci: add device_unplugged callback
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/30] virtio-pci: add device_unplugged callback |
Date: |
Fri, 29 Nov 2013 11:17:24 +0100 |
This fixes a crash in hot-unplug of virtio-pci devices behind a PCIe
switch. The crash happens because the ioeventfd is still set whent the
child is destroyed (destruction happens in postorder). Then the proxy
tries to unset to ioeventfd, but the virtqueue structure that holds the
EventNotifier has been trashed in the meanwhile. kvm_set_ioeventfd_pio
does not expect failure and aborts.
The fix is simply to move parts of uninitialization to a new
device_unplugged callback, which is called before the child is destroyed.
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio/virtio-pci.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 15b92e9..30c9f2b 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1002,6 +1002,15 @@ static void virtio_pci_device_plugged(DeviceState *d)
proxy->host_features);
}
+static void virtio_pci_device_unplugged(DeviceState *d)
+{
+ PCIDevice *pci_dev = PCI_DEVICE(d);
+ VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
+
+ virtio_pci_stop_ioeventfd(proxy);
+ msix_uninit_exclusive_bar(pci_dev);
+}
+
static int virtio_pci_init(PCIDevice *pci_dev)
{
VirtIOPCIProxy *dev = VIRTIO_PCI(pci_dev);
@@ -1016,9 +1025,7 @@ static int virtio_pci_init(PCIDevice *pci_dev)
static void virtio_pci_exit(PCIDevice *pci_dev)
{
VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev);
- virtio_pci_stop_ioeventfd(proxy);
memory_region_destroy(&proxy->bar);
- msix_uninit_exclusive_bar(pci_dev);
}
static void virtio_pci_reset(DeviceState *qdev)
@@ -1553,6 +1560,7 @@ static void virtio_pci_bus_class_init(ObjectClass *klass,
void *data)
k->set_guest_notifiers = virtio_pci_set_guest_notifiers;
k->vmstate_change = virtio_pci_vmstate_change;
k->device_plugged = virtio_pci_device_plugged;
+ k->device_unplugged = virtio_pci_device_unplugged;
}
static const TypeInfo virtio_pci_bus_info = {
--
1.8.3.1
- [Qemu-devel] [PATCH 02/30] virtio-bus: remove vdev field, (continued)
- [Qemu-devel] [PATCH 02/30] virtio-bus: remove vdev field, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 03/30] virtio-ccw: remove vdev field, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 04/30] virtio-pci: remove vdev field, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 06/30] virtio-blk: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 05/30] virtio-bus: cleanup plug/unplug interface, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 07/30] virtio-serial: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 08/30] virtio-net: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 09/30] virtio-scsi: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 10/30] virtio-balloon: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 11/30] virtio-rng: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 12/30] virtio-pci: add device_unplugged callback,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 13/30] virtio-blk-dataplane: Improve error reporting, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 14/30] virtio-9p: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 15/30] virtio-blk: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 16/30] virtio-serial: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 17/30] virtio-net: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 18/30] virtio-balloon: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 19/30] virtio-rng: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 20/30] virtio-scsi: QOM realize preparations, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 21/30] virtio: Start converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/11/29
- [Qemu-devel] [PATCH 22/30] virtio-9p: Convert to QOM realize, Paolo Bonzini, 2013/11/29