Commit bc6abcff authored by Maxime Coquelin's avatar Maxime Coquelin Committed by Michael S. Tsirkin
Browse files

vhost-user-blk: set config ops before vhost-user init 



As soon as vhost-user init is done, the backend may send
VHOST_USER_SLAVE_CONFIG_CHANGE_MSG, so let's set the
notification callback before it.

Also, it will be used to know whether the device supports
the config feature to advertize it or not.

Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 0e87fdc9

hw/block/vhost-user-blk.c

+2 −2
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) 
    s->dev.vq_index = 0;

    s->dev.backend_features = 0;



    vhost_dev_set_config_notifier(&s->dev, &blk_ops);



    ret = vhost_dev_init(&s->dev, &s->chardev, VHOST_BACKEND_TYPE_USER, 0);

    if (ret < 0) {

        error_setg(errp, "vhost-user-blk: vhost initialization failed: %s",
@@ -277,8 +279,6 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp) 
        s->blkcfg.num_queues = s->num_queues;

    }



    vhost_dev_set_config_notifier(&s->dev, &blk_ops);



    return;



vhost_err:

hw/virtio/vhost.c

+0 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,6 @@ int vhost_dev_set_config(struct vhost_dev *hdev, const uint8_t *data, 
void vhost_dev_set_config_notifier(struct vhost_dev *hdev,

                                   const VhostDevConfigOps *ops)

{

    assert(hdev->vhost_ops);

    hdev->config_ops = ops;

}