]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
virtio_scsi: enable VQs early on restore
authorMichael S. Tsirkin <mst@redhat.com>
Tue, 14 Oct 2014 23:52:32 +0000 (10:22 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 14 Oct 2014 23:55:08 +0000 (10:25 +1030)
virtio spec requires drivers to set DRIVER_OK before using VQs.
This is set automatically after restore returns, virtio scsi violated
this rule on restore by kicking event vq within restore.

To fix, call virtio_device_ready before using event queue.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
drivers/scsi/virtio_scsi.c

index 0642ce387c757c0020084805bc54f1c66945a126..6a39896b30dc40862f81806f4a66d3a173b76f6e 100644 (file)
@@ -1054,6 +1054,8 @@ static int virtscsi_restore(struct virtio_device *vdev)
                return err;
        }
 
+       virtio_device_ready(vdev);
+
        if (virtio_has_feature(vdev, VIRTIO_SCSI_F_HOTPLUG))
                virtscsi_kick_event_all(vscsi);