virtio_console: enable VQs early
authorMichael S. Tsirkin <mst@redhat.com>
Tue, 14 Oct 2014 23:52:31 +0000 (10:22 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 14 Oct 2014 23:55:03 +0000 (10:25 +1030)
virtio spec requires drivers to set DRIVER_OK before using VQs.
This is set automatically after probe returns, virtio console violated this
rule by adding inbufs, which causes the VQ to be used directly within
probe.

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 b585b4789822f976dc794bbfc1923a4215c82d11..d0f25bdc7ba5e60d08bbf6a8dad77767f1c4bbff 100644 (file)
@@ -1449,6 +1449,8 @@ static int add_port(struct ports_device *portdev, u32 id)
        spin_lock_init(&port->outvq_lock);
        init_waitqueue_head(&port->waitqueue);
 
+       virtio_device_ready(portdev->vdev);
+
        /* Fill the in_vq with buffers so the host can send us data. */
        nr_added_bufs = fill_queue(port->in_vq, &port->inbuf_lock);
        if (!nr_added_bufs) {