aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2014-10-14 19:52:32 -0400
committerRusty Russell <rusty@rustcorp.com.au>2014-10-14 19:55:09 -0400
commit401bbdc901b268113d7c562616feb7fc37492aca (patch)
treee16ab52fd1617a004e513c0291bc57831b4a498d
parent52c9cf1ac3d315995e9a65b900bc25e1d8a538b3 (diff)
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)
2184 if (ret) 2184 if (ret)
2185 return ret; 2185 return ret;
2186 2186
2187 virtio_device_ready(portdev->vdev);
2188
2187 if (use_multiport(portdev)) 2189 if (use_multiport(portdev))
2188 fill_queue(portdev->c_ivq, &portdev->c_ivq_lock); 2190 fill_queue(portdev->c_ivq, &portdev->c_ivq_lock);
2189 2191