From: Laszlo Ersek <lersek@redhat.com>
To: qemu-devel@nongnu.org, lersek@redhat.com
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Eugenio Perez Martin <eperezma@redhat.com>,
German Maglione <gmaglione@redhat.com>,
Liu Jiang <gerry@linux.alibaba.com>,
Sergio Lopez Pascual <slp@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>
Subject: [PATCH v3 4/7] vhost-user: flatten "enforce_reply" into "vhost_user_write_sync"
Date: Mon, 2 Oct 2023 22:32:18 +0200 [thread overview]
Message-ID: <20231002203221.17241-5-lersek@redhat.com> (raw)
In-Reply-To: <20231002203221.17241-1-lersek@redhat.com>
At this point, only "vhost_user_write_sync" calls "enforce_reply"; embed
the latter into the former.
This is purely refactoring -- no observable change.
Cc: "Michael S. Tsirkin" <mst@redhat.com> (supporter:vhost)
Cc: Eugenio Perez Martin <eperezma@redhat.com>
Cc: German Maglione <gmaglione@redhat.com>
Cc: Liu Jiang <gerry@linux.alibaba.com>
Cc: Sergio Lopez Pascual <slp@redhat.com>
Cc: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Tested-by: Albert Esteve <aesteve@redhat.com>
Reviewed-by: Eugenio Pérez <eperezma@redhat.com>
---
Notes:
v3:
- pick up R-b from Eugenio, T-b from Albert
v2:
- pick up R-b's from Phil and Stefano
- rename "vhost_user_write_msg" to "vhost_user_write_sync" (in code
context and commit message) [Stefano]
hw/virtio/vhost-user.c | 32 ++++++++------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 1476b36f0a6e..4129ba72e408 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -1302,24 +1302,6 @@ static int vhost_user_get_features(struct vhost_dev *dev, uint64_t *features)
return 0;
}
-static int enforce_reply(struct vhost_dev *dev,
- const VhostUserMsg *msg)
-{
- uint64_t dummy;
-
- if (msg->hdr.flags & VHOST_USER_NEED_REPLY_MASK) {
- return process_message_reply(dev, msg);
- }
-
- /*
- * We need to wait for a reply but the backend does not
- * support replies for the command we just sent.
- * Send VHOST_USER_GET_FEATURES which makes all backends
- * send a reply.
- */
- return vhost_user_get_features(dev, &dummy);
-}
-
/* Note: "msg->hdr.flags" may be modified. */
static int vhost_user_write_sync(struct vhost_dev *dev, VhostUserMsg *msg,
bool wait_for_reply)
@@ -1340,7 +1322,19 @@ static int vhost_user_write_sync(struct vhost_dev *dev, VhostUserMsg *msg,
}
if (wait_for_reply) {
- return enforce_reply(dev, msg);
+ uint64_t dummy;
+
+ if (msg->hdr.flags & VHOST_USER_NEED_REPLY_MASK) {
+ return process_message_reply(dev, msg);
+ }
+
+ /*
+ * We need to wait for a reply but the backend does not
+ * support replies for the command we just sent.
+ * Send VHOST_USER_GET_FEATURES which makes all backends
+ * send a reply.
+ */
+ return vhost_user_get_features(dev, &dummy);
}
return 0;
next prev parent reply other threads:[~2023-10-02 20:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 20:32 [PATCH v3 0/7] vhost-user: call VHOST_USER_SET_VRING_ENABLE synchronously Laszlo Ersek
2023-10-02 20:32 ` [PATCH v3 1/7] vhost-user: strip superfluous whitespace Laszlo Ersek
2023-10-04 9:06 ` Michael S. Tsirkin
2023-10-04 10:08 ` Laszlo Ersek
2023-10-04 12:54 ` Michael S. Tsirkin
2023-10-04 13:28 ` Laszlo Ersek
2023-10-02 20:32 ` [PATCH v3 2/7] vhost-user: tighten "reply_supported" scope in "set_vring_addr" Laszlo Ersek
2023-10-02 20:32 ` [PATCH v3 3/7] vhost-user: factor out "vhost_user_write_sync" Laszlo Ersek
2023-10-02 20:32 ` Laszlo Ersek [this message]
2023-10-02 20:32 ` [PATCH v3 5/7] vhost-user: hoist "write_sync", "get_features", "get_u64" Laszlo Ersek
2023-10-02 20:32 ` [PATCH v3 6/7] vhost-user: allow "vhost_set_vring" to wait for a reply Laszlo Ersek
2023-10-02 20:32 ` [PATCH v3 7/7] vhost-user: call VHOST_USER_SET_VRING_ENABLE synchronously Laszlo Ersek
2023-10-18 11:26 ` [PATCH v3 0/7] " Laszlo Ersek
2023-10-18 11:41 ` Stefan Hajnoczi
2023-10-18 11:59 ` Michael S. Tsirkin
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=20231002203221.17241-5-lersek@redhat.com \
--to=lersek@redhat.com \
--cc=eperezma@redhat.com \
--cc=gerry@linux.alibaba.com \
--cc=gmaglione@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sgarzare@redhat.com \
--cc=slp@redhat.com \
/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).