| Message ID | 20230827182937.146450-5-lersek@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vhost-user: call VHOST_USER_SET_VRING_ENABLE synchronously | expand |
On 27/8/23 20:29, Laszlo Ersek wrote: > At this point, only "vhost_user_write_msg" 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> > --- > hw/virtio/vhost-user.c | 32 ++++++++------------ > 1 file changed, 13 insertions(+), 19 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Sun, Aug 27, 2023 at 08:29:34PM +0200, Laszlo Ersek wrote: >At this point, only "vhost_user_write_msg" 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> >--- > hw/virtio/vhost-user.c | 32 ++++++++------------ > 1 file changed, 13 insertions(+), 19 deletions(-) Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 36f99b66a644..8eb7fd094c43 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_msg(struct vhost_dev *dev, VhostUserMsg *msg, bool wait_for_reply) @@ -1340,7 +1322,19 @@ static int vhost_user_write_msg(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;
At this point, only "vhost_user_write_msg" 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> --- hw/virtio/vhost-user.c | 32 ++++++++------------ 1 file changed, 13 insertions(+), 19 deletions(-)