From: Raphael Norwitz <raphael.norwitz@nutanix.com>
To: Kevin Wolf <kwolf@redhat.com>
Cc: Raphael Norwitz <raphael.norwitz@nutanix.com>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>,
"qemu-block@nongnu.org" <qemu-block@nongnu.org>,
"mst@redhat.com" <mst@redhat.com>
Subject: Re: [PATCH 6/7] vhost-user-blk: Factor out vhost_user_blk_realize_connect()
Date: Fri, 11 Jun 2021 20:11:17 +0000 [thread overview]
Message-ID: <20210611201116.GE26687@raphael-debian-dev> (raw)
In-Reply-To: <20210609154658.350308-7-kwolf@redhat.com>
On Wed, Jun 09, 2021 at 05:46:57PM +0200, Kevin Wolf wrote:
> This function is the part that we will want to retry if the connection
> is lost during initialisation, so factor it out to keep the following
> patch simpler.
>
> The error path for vhost_dev_get_config() forgot disconnecting the
> chardev, add this while touching the code.
>
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
> ---
> hw/block/vhost-user-blk.c | 48 ++++++++++++++++++++++++++-------------
> 1 file changed, 32 insertions(+), 16 deletions(-)
>
> diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
> index 3770f715da..e49d2e4c83 100644
> --- a/hw/block/vhost-user-blk.c
> +++ b/hw/block/vhost-user-blk.c
> @@ -423,6 +423,36 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event)
> }
> }
>
> +static int vhost_user_blk_realize_connect(VHostUserBlk *s, Error **errp)
> +{
> + DeviceState *dev = &s->parent_obj.parent_obj;
> + int ret;
> +
> + s->connected = false;
> +
> + ret = qemu_chr_fe_wait_connected(&s->chardev, errp);
> + if (ret < 0) {
> + return ret;
> + }
> +
> + ret = vhost_user_blk_connect(dev, errp);
> + if (ret < 0) {
> + qemu_chr_fe_disconnect(&s->chardev);
> + return ret;
> + }
> + assert(s->connected);
> +
> + ret = vhost_dev_get_config(&s->dev, (uint8_t *)&s->blkcfg,
> + sizeof(struct virtio_blk_config), errp);
> + if (ret < 0) {
> + qemu_chr_fe_disconnect(&s->chardev);
> + vhost_dev_cleanup(&s->dev);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
> {
> VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> @@ -467,22 +497,10 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
>
> s->inflight = g_new0(struct vhost_inflight, 1);
> s->vhost_vqs = g_new0(struct vhost_virtqueue, s->num_queues);
> - s->connected = false;
> -
> - if (qemu_chr_fe_wait_connected(&s->chardev, errp) < 0) {
> - goto virtio_err;
> - }
>
> - if (vhost_user_blk_connect(dev, errp) < 0) {
> - qemu_chr_fe_disconnect(&s->chardev);
> - goto virtio_err;
> - }
> - assert(s->connected);
> -
> - ret = vhost_dev_get_config(&s->dev, (uint8_t *)&s->blkcfg,
> - sizeof(struct virtio_blk_config), errp);
> + ret = vhost_user_blk_realize_connect(s, errp);
> if (ret < 0) {
> - goto vhost_err;
> + goto virtio_err;
> }
>
> /* we're fully initialized, now we can operate, so add the handler */
> @@ -491,8 +509,6 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
> NULL, true);
> return;
>
> -vhost_err:
> - vhost_dev_cleanup(&s->dev);
> virtio_err:
> g_free(s->vhost_vqs);
> s->vhost_vqs = NULL;
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-06-11 20:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 15:46 [PATCH 0/7] vhost-user-blk: Implement reconnection during realize Kevin Wolf
2021-06-09 15:46 ` [PATCH 1/7] vhost: Add Error parameter to vhost_dev_init() Kevin Wolf
2021-06-10 9:05 ` Stefano Garzarella
2021-06-11 19:14 ` Raphael Norwitz
2021-06-09 15:46 ` [PATCH 2/7] vhost: Distinguish errors in vhost_backend_init() Kevin Wolf
2021-06-10 9:07 ` Stefano Garzarella
2021-06-11 19:43 ` Raphael Norwitz
2021-06-09 15:46 ` [PATCH 3/7] vhost: Return 0/-errno in vhost_dev_init() Kevin Wolf
2021-06-10 9:09 ` Stefano Garzarella
2021-06-11 19:49 ` Raphael Norwitz
2021-06-09 15:46 ` [PATCH 4/7] vhost-user-blk: Add Error parameter to vhost_user_blk_start() Kevin Wolf
2021-06-10 9:11 ` Stefano Garzarella
2021-06-11 19:55 ` Raphael Norwitz
2021-06-09 15:46 ` [PATCH 5/7] vhost: Distinguish errors in vhost_dev_get_config() Kevin Wolf
2021-06-10 9:16 ` Stefano Garzarella
2021-06-11 20:08 ` Raphael Norwitz
2021-06-09 15:46 ` [PATCH 6/7] vhost-user-blk: Factor out vhost_user_blk_realize_connect() Kevin Wolf
2021-06-10 9:18 ` Stefano Garzarella
2021-06-11 20:11 ` Raphael Norwitz [this message]
2021-06-09 15:46 ` [PATCH 7/7] vhost-user-blk: Implement reconnection during realize Kevin Wolf
2021-06-10 9:23 ` Stefano Garzarella
2021-06-11 20:15 ` Raphael Norwitz
2021-06-30 12:39 ` [PATCH 0/7] " Kevin Wolf
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=20210611201116.GE26687@raphael-debian-dev \
--to=raphael.norwitz@nutanix.com \
--cc=kwolf@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.