[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 01/12] virtio-ccw: move virtio_ccw_stop_ioeventfd
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 01/12] virtio-ccw: move virtio_ccw_stop_ioeventfd to virtio_ccw_busdev_unplug |
Date: |
Tue, 15 Oct 2013 18:46:39 +0200 |
Similar to the PCI bug that prompted these patches, virtio-ccw will
segfault after the reworking of hotplug/hot-unplug. Prepare for
this by moving virtio_ccw_stop_ioeventfd to before the freeing
of the proxy device.
A better place for this could be the device_unplugged callback
for the virtio-ccw bus. However, we do not yet have a callback
that works: this patch avoids the problem while leaving the tree
bisectable.
Cc: address@hidden
Reported-by: Cornelia Huck <address@hidden>
Suggested-by: Cornelia Huck <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/s390x/virtio-ccw.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index cd67db5..a6accdf 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -631,7 +631,6 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev)
{
SubchDev *sch = dev->sch;
- virtio_ccw_stop_ioeventfd(dev);
if (sch) {
css_subch_assign(sch->cssid, sch->ssid, sch->schid, sch->devno, NULL);
g_free(sch);
@@ -1228,6 +1227,8 @@ static int virtio_ccw_busdev_unplug(DeviceState *dev)
VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev;
SubchDev *sch = _dev->sch;
+ virtio_ccw_stop_ioeventfd(_dev);
+
/*
* We should arrive here only for device_del, since we don't support
* direct hot(un)plug of channels, but only through virtio.
--
1.8.3.1
- [Qemu-devel] [PATCH v3 00/12] virtio: cleanup and fix hot-unplug, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 02/12] virtio-bus: remove vdev field, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 01/12] virtio-ccw: move virtio_ccw_stop_ioeventfd to virtio_ccw_busdev_unplug,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 03/12] virtio-ccw: remove vdev field, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 04/12] virtio-pci: remove vdev field, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 06/12] virtio-blk: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 05/12] virtio-bus: cleanup plug/unplug interface, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 07/12] virtio-serial: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 08/12] virtio-net: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 09/12] virtio-scsi: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 10/12] virtio-balloon: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 11/12] virtio-rng: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-devel] [PATCH v3 12/12] virtio-pci: add device_unplugged callback, Paolo Bonzini, 2013/10/15