Commit 6d62c37f authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Rusty Russell

virtio_blk: enable VQs early on restore

virtio spec requires drivers to set DRIVER_OK before using VQs.
This is set automatically after restore returns, virtio block violated
this rule on restore by restarting queues, which might in theory
cause the VQ to be used directly within restore.

To fix, call virtio_device_ready before using starting queues.
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent cd679048
...@@ -804,10 +804,13 @@ static int virtblk_restore(struct virtio_device *vdev) ...@@ -804,10 +804,13 @@ static int virtblk_restore(struct virtio_device *vdev)
int ret; int ret;
ret = init_vq(vdev->priv); ret = init_vq(vdev->priv);
if (!ret) if (ret)
blk_mq_start_stopped_hw_queues(vblk->disk->queue, true); return ret;
virtio_device_ready(vdev);
return ret; blk_mq_start_stopped_hw_queues(vblk->disk->queue, true);
return 0;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment