[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 8/9] virtio-scsi: clean up virtio_scsi_handle_cmd_vq()
From: |
Stefan Hajnoczi |
Subject: |
[PULL 8/9] virtio-scsi: clean up virtio_scsi_handle_cmd_vq() |
Date: |
Mon, 9 May 2022 13:53:14 +0100 |
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>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20220427143541.119567-6-stefanha@redhat.com
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 ac99800ee2..2040352102 100644
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -149,7 +149,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)
--
2.35.1
- [PULL 0/9] Block patches, Stefan Hajnoczi, 2022/05/09
- [PULL 1/9] Introduce event-loop-base abstract class, Stefan Hajnoczi, 2022/05/09
- [PULL 2/9] util/main-loop: Introduce the main loop into QOM, Stefan Hajnoczi, 2022/05/09
- [PULL 5/9] virtio-scsi: don't waste CPU polling the event virtqueue, Stefan Hajnoczi, 2022/05/09
- [PULL 4/9] virtio-scsi: fix ctrl and event handler functions in dataplane mode, Stefan Hajnoczi, 2022/05/09
- [PULL 3/9] util/event-loop-base: Introduce options to set the thread pool size, Stefan Hajnoczi, 2022/05/09
- [PULL 6/9] virtio-scsi: clean up virtio_scsi_handle_event_vq(), Stefan Hajnoczi, 2022/05/09
- [PULL 7/9] virtio-scsi: clean up virtio_scsi_handle_ctrl_vq(), Stefan Hajnoczi, 2022/05/09
- [PULL 8/9] virtio-scsi: clean up virtio_scsi_handle_cmd_vq(),
Stefan Hajnoczi <=
- [PULL 9/9] virtio-scsi: move request-related items from .h to .c, Stefan Hajnoczi, 2022/05/09
- Re: [PULL 0/9] Block patches, Richard Henderson, 2022/05/09
- Re: [PULL 0/9] Block patches, Philippe Mathieu-Daudé, 2022/05/11