david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: Make errp the last parameter of virtio_scsi_common_realize

Browse Source 
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-12-famz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Fam Zheng 2017-04-21 20:27:07 +08:00 committed by Markus Armbruster
parent c0ca74f6f3
commit bf46e67ddb
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/scsi/vhost-scsi.c
View File

@ -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,
vhost_dummy_handle_output,
&err);
if (err != NULL) { if (err != NULL) {
error_propagate(errp, err); error_propagate(errp, err);
goto close_fd; goto close_fd;

11
hw/scsi/virtio-scsi.c
View File

@ -841,10 +841,11 @@ static struct SCSIBusInfo virtio_scsi_scsi_info = {
.load_request = virtio_scsi_load_request, .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 ctrl,
VirtIOHandleOutput evt, VirtIOHandleOutput evt,
VirtIOHandleOutput cmd) VirtIOHandleOutput cmd,
Error **errp)
{ {
VirtIODevice *vdev = VIRTIO_DEVICE(dev); VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOSCSICommon *s = VIRTIO_SCSI_COMMON(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); VirtIOSCSI *s = VIRTIO_SCSI(dev);
Error *err = NULL; 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_event,
virtio_scsi_handle_cmd); virtio_scsi_handle_cmd,
&err);
if (err != NULL) { if (err != NULL) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;

8
include/hw/virtio/virtio-scsi.h
View File

@ -135,9 +135,11 @@ static inline void virtio_scsi_release(VirtIOSCSI *s)
} }
} }
void virtio_scsi_common_realize(DeviceState *dev, Error **errp, void virtio_scsi_common_realize(DeviceState *dev,
VirtIOHandleOutput ctrl, VirtIOHandleOutput evt, VirtIOHandleOutput ctrl,
VirtIOHandleOutput cmd); VirtIOHandleOutput evt,
VirtIOHandleOutput cmd,
Error **errp);
void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp); void virtio_scsi_common_unrealize(DeviceState *dev, Error **errp);
bool virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq); bool virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq);