Commit a57f0091 authored by Xie Yongji's avatar Xie Yongji Committed by Michael S. Tsirkin
Browse files

vhost-user-blk: Add return value for vhost_user_blk_start() 



Add a return value for vhost_user_blk_start() to check whether
we start vhost-user backend successfully or not.

Signed-off-by: default avatarXie Yongji <xieyongji@baidu.com>
Signed-off-by: default avatarZhang Yu <zhangyu31@baidu.com>
Message-Id: <20190320112646.3712-6-xieyongji@baidu.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent f3facbe6

hw/block/vhost-user-blk.c

+5 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ const VhostDevConfigOps blk_ops = { 
    .vhost_dev_config_notifier = vhost_user_blk_handle_config_change,

};



static void vhost_user_blk_start(VirtIODevice *vdev)

static int vhost_user_blk_start(VirtIODevice *vdev)

{

    VHostUserBlk *s = VHOST_USER_BLK(vdev);

    BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
@@ -112,13 +112,13 @@ static void vhost_user_blk_start(VirtIODevice *vdev) 


    if (!k->set_guest_notifiers) {

        error_report("binding does not support guest notifiers");

        return;

        return -ENOSYS;

    }



    ret = vhost_dev_enable_notifiers(&s->dev, vdev);

    if (ret < 0) {

        error_report("Error enabling host notifiers: %d", -ret);

        return;

        return ret;

    }



    ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, true);
@@ -157,12 +157,13 @@ static void vhost_user_blk_start(VirtIODevice *vdev) 
        vhost_virtqueue_mask(&s->dev, vdev, i, false);

    }



    return;

    return ret;



err_guest_notifiers:

    k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);

err_host_notifiers:

    vhost_dev_disable_notifiers(&s->dev, vdev);

    return ret;

}



static void vhost_user_blk_stop(VirtIODevice *vdev)