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: Michael S. Tsirkin <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
This commit is contained in:
Michael S. Tsirkin 2014-10-15 10:22:32 +10:30 • committed by Rusty Russell
commit 6d62c37f19

View file

@ -804,10 +804,13 @@ static int virtblk_restore(struct virtio_device *vdev)
int ret;
ret = init_vq(vdev->priv);
if (!ret)
blk_mq_start_stopped_hw_queues(vblk->disk->queue, true);
if (ret)
return ret;
return ret;
virtio_device_ready(vdev);
blk_mq_start_stopped_hw_queues(vblk->disk->queue, true);
return 0;
}
#endif