From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: <qemu-block@nongnu.org>,
Richard Henderson <richard.henderson@linaro.org>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 7/9] virtio-scsi: clean up virtio_scsi_handle_ctrl_vq()
Date: Mon, 9 May 2022 13:53:13 +0100 [thread overview]
Message-ID: <20220509125315.3746865-8-stefanha@redhat.com> (raw)
In-Reply-To: <20220509125315.3746865-1-stefanha@redhat.com>
virtio_scsi_handle_ctrl_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-5-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 85e69d0368..ac99800ee2 100644
--- a/include/hw/virtio/virtio-scsi.h
+++ b/include/hw/virtio/virtio-scsi.h
@@ -150,7 +150,6 @@ void virtio_scsi_common_realize(DeviceState *dev,
void virtio_scsi_common_unrealize(DeviceState *dev);
bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq);
-bool virtio_scsi_handle_ctrl_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 aa03a713d8..eefda16e4b 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -460,16 +460,13 @@ static void virtio_scsi_handle_ctrl_req(VirtIOSCSI *s, VirtIOSCSIReq *req)
}
}
-bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq)
+static void virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq)
{
VirtIOSCSIReq *req;
- bool progress = false;
while ((req = virtio_scsi_pop_req(s, vq))) {
- progress = true;
virtio_scsi_handle_ctrl_req(s, req);
}
- return progress;
}
/*
--
2.35.1
next prev parent reply other threads:[~2022-05-09 13:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 12:53 [PULL 0/9] Block patches Stefan Hajnoczi
2022-05-09 12:53 ` [PULL 1/9] Introduce event-loop-base abstract class Stefan Hajnoczi
2022-05-09 12:53 ` [PULL 2/9] util/main-loop: Introduce the main loop into QOM Stefan Hajnoczi
2022-05-09 12:53 ` [PULL 3/9] util/event-loop-base: Introduce options to set the thread pool size Stefan Hajnoczi
2022-05-09 12:53 ` [PULL 4/9] virtio-scsi: fix ctrl and event handler functions in dataplane mode Stefan Hajnoczi
2022-05-09 12:53 ` [PULL 5/9] virtio-scsi: don't waste CPU polling the event virtqueue Stefan Hajnoczi
2022-05-09 12:53 ` [PULL 6/9] virtio-scsi: clean up virtio_scsi_handle_event_vq() Stefan Hajnoczi
2022-05-09 12:53 ` Stefan Hajnoczi [this message]
2022-05-09 12:53 ` [PULL 8/9] virtio-scsi: clean up virtio_scsi_handle_cmd_vq() Stefan Hajnoczi
2022-05-09 12:53 ` [PULL 9/9] virtio-scsi: move request-related items from .h to .c Stefan Hajnoczi
2022-05-09 19:41 ` [PULL 0/9] Block patches Richard Henderson
2022-05-11 22:29 ` Philippe Mathieu-Daudé via
2022-05-28 11:02 ` Philippe Mathieu-Daudé via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220509125315.3746865-8-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).