Commit bf46e67d authored by Fam Zheng's avatar Fam Zheng Committed by Markus Armbruster
Browse files

scsi: Make errp the last parameter of virtio_scsi_common_realize 



Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-12-famz@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent c0ca74f6

hw/scsi/vhost-scsi.c

+4 −2
Original line number Diff line number Diff line
@@ -233,9 +233,11 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp) 
        }

    }



    virtio_scsi_common_realize(dev, &err, vhost_dummy_handle_output,

    virtio_scsi_common_realize(dev,

                               vhost_dummy_handle_output,

                               vhost_dummy_handle_output);

                               vhost_dummy_handle_output,

                               vhost_dummy_handle_output,

                               &err);

    if (err != NULL) {

        error_propagate(errp, err);

        goto close_fd;

hw/scsi/virtio-scsi.c

+7 −4
Original line number Diff line number Diff line
@@ -841,10 +841,11 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = { 
    .load_request = virtio_scsi_load_request,

};



void virtio_scsi_common_realize(DeviceState *dev, Error **errp,

void virtio_scsi_common_realize(DeviceState *dev,

                                VirtIOHandleOutput ctrl,

                                VirtIOHandleOutput evt,

                                VirtIOHandleOutput cmd)

                                VirtIOHandleOutput cmd,

                                Error **errp)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(dev);

    VirtIOSCSICommon *s = VIRTIO_SCSI_COMMON(dev);
@@ -878,9 +879,11 @@ static void virtio_scsi_device_realize(DeviceState *dev, Error **errp) 
    VirtIOSCSI *s = VIRTIO_SCSI(dev);

    Error *err = NULL;



    virtio_scsi_common_realize(dev, &err, virtio_scsi_handle_ctrl,

    virtio_scsi_common_realize(dev,

                               virtio_scsi_handle_ctrl,

                               virtio_scsi_handle_event,

                               virtio_scsi_handle_cmd);

                               virtio_scsi_handle_cmd,

                               &err);

    if (err != NULL) {

        error_propagate(errp, err);

        return;

include/hw/virtio/virtio-scsi.h

+5 −3
Original line number Diff line number Diff line
@@ -135,9 +135,11 @@ static inline void virtio_scsi_release(VirtIOSCSI *s) 
    }

}



void virtio_scsi_common_realize(DeviceState *dev, Error **errp,

                                VirtIOHandleOutput ctrl, VirtIOHandleOutput evt,

                                VirtIOHandleOutput cmd);

void virtio_scsi_common_realize(DeviceState *dev,

                                VirtIOHandleOutput ctrl,

                                VirtIOHandleOutput evt,

                                VirtIOHandleOutput cmd,

                                Error **errp);



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

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