virtio_console: 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:09 +0000 (10:25 +1030)
virtio spec requires drivers to set DRIVER_OK before using VQs.
This is set automatically after resume returns, virtio console violated this
rule by adding inbufs, which causes the VQ to be used directly within
restore.

To fix, call virtio_device_ready before using VQs.

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

index d0f25bdc7ba5e60d08bbf6a8dad77767f1c4bbff..bfa640023e64893251d2cb2cf54af5a853d89568 100644 (file)
@@ -2184,6 +2184,8 @@ static int virtcons_restore(struct virtio_device *vdev)
        if (ret)
                return ret;
 
+       virtio_device_ready(portdev->vdev);
+
        if (use_multiport(portdev))
                fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);