summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2014-10-15 01:52:32 +0200
committerRusty Russell <rusty@rustcorp.com.au>2014-10-15 01:55:09 +0200
commit401bbdc901b268113d7c562616feb7fc37492aca (patch)
treee16ab52fd1617a004e513c0291bc57831b4a498d
parentvirtio_scsi: enable VQs early on restore (diff)
downloadlinux-401bbdc901b268113d7c562616feb7fc37492aca.tar.xz
linux-401bbdc901b268113d7c562616feb7fc37492aca.zip
virtio_console: enable VQs early on restore
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>
-rw-r--r--drivers/char/virtio_console.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index d0f25bdc7ba5..bfa640023e64 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -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);