On 4/27/22 16:35, Stefan Hajnoczi wrote:
> virtio_scsi_handle_cmd_vq() is only called from hw/scsi/virtio-scsi.c
> now and its return value is no longer used. Remove the function
> prototype from virtio-scsi.h and drop the return value.
>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> include/hw/virtio/virtio-scsi.h | 1 -
> hw/scsi/virtio-scsi.c | 5 +----
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
> index 44dc3b81ec..2497530064 100644
> --- a/include/hw/virtio/virtio-scsi.h
> +++ b/include/hw/virtio/virtio-scsi.h
> @@ -151,7 +151,6 @@ void virtio_scsi_common_realize(DeviceState *dev,
> Error **errp);
>
> void virtio_scsi_common_unrealize(DeviceState *dev);
> -bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq);
> void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req);
> void virtio_scsi_free_req(VirtIOSCSIReq *req);
> void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
> diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
> index eefda16e4b..12c6a21202 100644
> --- a/hw/scsi/virtio-scsi.c
> +++ b/hw/scsi/virtio-scsi.c
> @@ -685,12 +685,11 @@ static void virtio_scsi_handle_cmd_req_submit(VirtIOSCSI *s, VirtIOSCSIReq *req)
> scsi_req_unref(sreq);
> }
>
> -bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq)
> +static void virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq)
> {
> VirtIOSCSIReq *req, *next;
> int ret = 0;
> bool suppress_notifications = virtio_queue_get_notification(vq);
> - bool progress = false;
>
> QTAILQ_HEAD(, VirtIOSCSIReq) reqs = QTAILQ_HEAD_INITIALIZER(reqs);
>
> @@ -700,7 +699,6 @@ bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq)
> }
>
> while ((req = virtio_scsi_pop_req(s, vq))) {
> - progress = true;
> ret = virtio_scsi_handle_cmd_req_prepare(s, req);
> if (!ret) {
> QTAILQ_INSERT_TAIL(&reqs, req, next);
> @@ -725,7 +723,6 @@ bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq)
> QTAILQ_FOREACH_SAFE(req, &reqs, next, next) {
> virtio_scsi_handle_cmd_req_submit(s, req);
> }
> - return progress;
> }
>
> static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq)
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>