summaryrefslogtreecommitdiff
path: root/hw/block
diff options
context:
space:
mode:
authorMaxime Coquelin <maxime.coquelin@redhat.com>2018-03-29 09:52:32 +0200
committerMichael S. Tsirkin <mst@redhat.com>2018-04-09 17:35:45 +0300
commitbc6abcff7c608dba27962efa75f234c5dd10e290 (patch)
tree00f35104833ecde321337f3461ce934acc35009d /hw/block
parent0e87fdc966d05f4e5ad868034fcd8ee2a08ca62d (diff)
downloadqemu-bc6abcff7c608dba27962efa75f234c5dd10e290.tar.gz
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: Maxime Coquelin <maxime.coquelin@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Changpeng Liu <changpeng.liu@intel.com>
Diffstat (limited to 'hw/block')
-rw-r--r--hw/block/vhost-user-blk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index f840f07dfe..262baca432 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -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: