Commit 0b81c1ef authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

virtio-ccw: move virtio_ccw_stop_ioeventfd to virtio_ccw_busdev_unplug 



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: qemu-stable@nongnu.org
Reported-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Suggested-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarAndreas Faerber <afaerber@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7dc65c02

hw/s390x/virtio-ccw.c

+2 −1
Original line number Diff line number Diff line
@@ -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.