motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio-scsi: remove unused argument to virtio_scsi_common_realize

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

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-07-17 11:46:50 +02:00
parent 1e44f3ab71
commit 12e1dc4939
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/scsi/vhost-scsi.c
View file

@ -262,7 +262,7 @@ static void vhost_scsi_unrealize(DeviceState *dev, Error **errp)
vhost_dev_cleanup(&vsc->dev); vhost_dev_cleanup(&vsc->dev);
g_free(vqs); g_free(vqs);
virtio_scsi_common_unrealize(dev, errp); virtio_scsi_common_unrealize(dev);
} }
static Property vhost_scsi_properties[] = { static Property vhost_scsi_properties[] = {

2
hw/scsi/vhost-user-scsi.c
View file

@ -125,7 +125,7 @@ static void vhost_user_scsi_unrealize(DeviceState *dev, Error **errp)
vhost_dev_cleanup(&vsc->dev); vhost_dev_cleanup(&vsc->dev);
g_free(vqs); g_free(vqs);
virtio_scsi_common_unrealize(dev, errp); virtio_scsi_common_unrealize(dev);
vhost_user_cleanup(&s->vhost_user); vhost_user_cleanup(&s->vhost_user);
} }

4
hw/scsi/virtio-scsi.c
View file

@ -922,7 +922,7 @@ static void virtio_scsi_device_realize(DeviceState *dev, Error **errp)
virtio_scsi_dataplane_setup(s, 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); VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(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); VirtIOSCSI *s = VIRTIO_SCSI(dev);
qbus_set_hotplug_handler(BUS(&s->bus), NULL, &error_abort); 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[] = { static Property virtio_scsi_properties[] = {

2
include/hw/virtio/virtio-scsi.h
View file

@ -145,7 +145,7 @@ void virtio_scsi_common_realize(DeviceState *dev,
VirtIOHandleOutput cmd, VirtIOHandleOutput cmd,
Error **errp); 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_event_vq(VirtIOSCSI *s, VirtQueue *vq);
bool virtio_scsi_handle_cmd_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); bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq);