Commit e3c9d76a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

virtio-scsi: switch exit callback to VirtioDeviceClass 



This ensures hot-unplug is handled properly by the proxy, and avoids
leaking bus_name which is freed by virtio_device_exit.

Cc: qemu-stable@nongnu.org
Acked-by: default avatarAndreas Faerber <afaerber@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3786cff5

hw/scsi/vhost-scsi.c

+5 −6
Original line number Diff line number Diff line
@@ -240,11 +240,10 @@ static int vhost_scsi_init(VirtIODevice *vdev) 
    return 0;

}



static int vhost_scsi_exit(DeviceState *qdev)

static void vhost_scsi_exit(VirtIODevice *vdev)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(qdev);

    VHostSCSI *s = VHOST_SCSI(qdev);

    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(qdev);

    VHostSCSI *s = VHOST_SCSI(vdev);

    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);



    migrate_del_blocker(s->migration_blocker);

    error_free(s->migration_blocker);
@@ -253,7 +252,7 @@ static int vhost_scsi_exit(DeviceState *qdev) 
    vhost_scsi_set_status(vdev, 0);



    g_free(s->dev.vqs);

    return virtio_scsi_common_exit(vs);

    virtio_scsi_common_exit(vs);

}



static Property vhost_scsi_properties[] = {
@@ -265,10 +264,10 @@ static void vhost_scsi_class_init(ObjectClass *klass, void *data) 
{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);

    dc->exit = vhost_scsi_exit;

    dc->props = vhost_scsi_properties;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    vdc->init = vhost_scsi_init;

    vdc->exit = vhost_scsi_exit;

    vdc->get_features = vhost_scsi_get_features;

    vdc->set_config = vhost_scsi_set_config;

    vdc->set_status = vhost_scsi_set_status;

hw/scsi/virtio-scsi.c

+7 −8
Original line number Diff line number Diff line
@@ -644,22 +644,21 @@ static int virtio_scsi_device_init(VirtIODevice *vdev) 
    return 0;

}



int virtio_scsi_common_exit(VirtIOSCSICommon *vs)

void virtio_scsi_common_exit(VirtIOSCSICommon *vs)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(vs);



    g_free(vs->cmd_vqs);

    virtio_cleanup(vdev);

    return 0;

}



static int virtio_scsi_device_exit(DeviceState *qdev)

static void virtio_scsi_device_exit(VirtIODevice *vdev)

{

    VirtIOSCSI *s = VIRTIO_SCSI(qdev);

    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(qdev);

    VirtIOSCSI *s = VIRTIO_SCSI(vdev);

    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev);



    unregister_savevm(qdev, "virtio-scsi", s);

    return virtio_scsi_common_exit(vs);

    unregister_savevm(DEVICE(vdev), "virtio-scsi", s);

    virtio_scsi_common_exit(vs);

}



static Property virtio_scsi_properties[] = {
@@ -680,10 +679,10 @@ static void virtio_scsi_class_init(ObjectClass *klass, void *data) 
{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);

    dc->exit = virtio_scsi_device_exit;

    dc->props = virtio_scsi_properties;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    vdc->init = virtio_scsi_device_init;

    vdc->exit = virtio_scsi_device_exit;

    vdc->set_config = virtio_scsi_set_config;

    vdc->get_features = virtio_scsi_get_features;

    vdc->reset = virtio_scsi_reset;

include/hw/virtio/virtio-scsi.h

+1 −1
Original line number Diff line number Diff line
@@ -187,6 +187,6 @@ typedef struct { 
                                            VIRTIO_SCSI_F_CHANGE, true)



int virtio_scsi_common_init(VirtIOSCSICommon *vs);

int virtio_scsi_common_exit(VirtIOSCSICommon *vs);

void virtio_scsi_common_exit(VirtIOSCSICommon *vs);



#endif /* _QEMU_VIRTIO_SCSI_H */