> On Nov 23, 2023, at 12:54 AM, Li Feng wrote:
>
> If the error occurs in vhost_dev_init, the value of s->connected is set to
> true
> in advance, and there is no chance to enter this function execution again
> in the future.
>
> Signed-off-by: Li Feng
Reviewed-by: Raphael Norwitz
> ---
> hw/block/vhost-user-blk.c | 8 +++-
> hw/scsi/vhost-user-scsi.c | 3 ++-
> hw/virtio/vhost-user-gpio.c | 3 ++-
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
> index 818b833108..2863d80d15 100644
> --- a/hw/block/vhost-user-blk.c
> +++ b/hw/block/vhost-user-blk.c
> @@ -326,7 +326,6 @@ static int vhost_user_blk_connect(DeviceState *dev, Error
> **errp)
> if (s->connected) {
> return 0;
> }
> -s->connected = true;
>
> s->dev.num_queues = s->num_queues;
> s->dev.nvqs = s->num_queues;
> @@ -343,15 +342,14 @@ static int vhost_user_blk_connect(DeviceState *dev,
> Error **errp)
> return ret;
> }
>
> +s->connected = true;
> +
> /* restore vhost state */
> if (virtio_device_started(vdev, vdev->status)) {
> ret = vhost_user_blk_start(vdev, errp);
> -if (ret < 0) {
> -return ret;
> -}
> }
>
> -return 0;
> +return ret;
> }
>
> static void vhost_user_blk_disconnect(DeviceState *dev)
> diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c
> index 4486500cac..2060f9f94b 100644
> --- a/hw/scsi/vhost-user-scsi.c
> +++ b/hw/scsi/vhost-user-scsi.c
> @@ -147,7 +147,6 @@ static int vhost_user_scsi_connect(DeviceState *dev,
> Error **errp)
> if (s->connected) {
> return 0;
> }
> -s->connected = true;
>
> vsc->dev.num_queues = vs->conf.num_queues;
> vsc->dev.nvqs = VIRTIO_SCSI_VQ_NUM_FIXED + vs->conf.num_queues;
> @@ -161,6 +160,8 @@ static int vhost_user_scsi_connect(DeviceState *dev,
> Error **errp)
> return ret;
> }
>
> +s->connected = true;
> +
> /* restore vhost state */
> if (virtio_device_started(vdev, vdev->status)) {
> ret = vhost_user_scsi_start(s, errp);
> diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c
> index aff2d7eff6..a83437a5da 100644
> --- a/hw/virtio/vhost-user-gpio.c
> +++ b/hw/virtio/vhost-user-gpio.c
> @@ -229,7 +229,6 @@ static int vu_gpio_connect(DeviceState *dev, Error **errp)
> if (gpio->connected) {
> return 0;
> }
> -gpio->connected = true;
>
> vhost_dev_set_config_notifier(vhost_dev, _ops);
> gpio->vhost_user.supports_config = true;
> @@ -243,6 +242,8 @@ static int vu_gpio_connect(DeviceState *dev, Error **errp)
> return ret;
> }
>
> +gpio->connected = true;
> +
> /* restore vhost state */
> if (virtio_device_started(vdev, vdev->status)) {
> vu_gpio_start(vdev);
> --
> 2.42.0
>
