diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-10-15 01:52:31 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2014-10-15 01:55:03 +0200 |
| commit | f5866db64f341776c2d9ed48080f82459fea6a55 (patch) | |
| tree | 08491413923d1c821db0403d17920c15d238a4df /drivers/char | |
| parent | virtio_blk: enable VQs early (diff) | |
| download | linux-f5866db64f341776c2d9ed48080f82459fea6a55.tar.xz linux-f5866db64f341776c2d9ed48080f82459fea6a55.zip | |
virtio_console: enable VQs early
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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/virtio_console.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index b585b4789822..d0f25bdc7ba5 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -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) { |