diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-10-15 10:22:32 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2014-10-15 10:25:09 +1030 |
| commit | 401bbdc901b268113d7c562616feb7fc37492aca (patch) | |
| tree | e16ab52fd1617a004e513c0291bc57831b4a498d | |
| parent | 52c9cf1ac3d315995e9a65b900bc25e1d8a538b3 (diff) | |
| download | linux-401bbdc901b268113d7c562616feb7fc37492aca.tar.gz linux-401bbdc901b268113d7c562616feb7fc37492aca.tar.bz2 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.c | 2 |
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); |