Commit 12e1dc49 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

virtio-scsi: remove unused argument to virtio_scsi_common_realize 



The argument is not used and passing it clutters error propagation in the
callers.  So, get rid of it.

Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1e44f3ab

hw/scsi/vhost-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static void vhost_scsi_unrealize(DeviceState *dev, Error **errp) 
    vhost_dev_cleanup(&vsc->dev);

    g_free(vqs);



    virtio_scsi_common_unrealize(dev, errp);

    virtio_scsi_common_unrealize(dev);

}



static Property vhost_scsi_properties[] = {

hw/scsi/vhost-user-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void vhost_user_scsi_unrealize(DeviceState *dev, Error **errp) 
    vhost_dev_cleanup(&vsc->dev);

    g_free(vqs);



    virtio_scsi_common_unrealize(dev, errp);

    virtio_scsi_common_unrealize(dev);

    vhost_user_cleanup(&s->vhost_user);

}

hw/scsi/virtio-scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ static void virtio_scsi_device_realize(DeviceState *dev, Error **errp) 
    virtio_scsi_dataplane_setup(s, errp);

}



void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp)

void virtio_scsi_common_unrealize(DeviceState *dev)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(dev);

    VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
@@ -936,7 +936,7 @@ static void virtio_scsi_device_unrealize(DeviceState *dev, Error **errp) 
    VirtIOSCSI *s = VIRTIO_SCSI(dev);



    qbus_set_hotplug_handler(BUS(&s->bus), NULL, &error_abort);

    virtio_scsi_common_unrealize(dev, errp);

    virtio_scsi_common_unrealize(dev);

}



static Property virtio_scsi_properties[] = {

include/hw/virtio/virtio-scsi.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ void virtio_scsi_common_realize(DeviceState *dev, 
                                VirtIOHandleOutput cmd,

                                Error **errp);



void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp);

void virtio_scsi_common_unrealize(DeviceState *dev);

bool virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq);

bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq);

bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq);