diff options
| author | Amit Shah | 2010-07-01 11:28:17 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2010-07-13 16:06:58 +0200 |
| commit | fd11a78be8dfc992a5c642d8e2e1ebd80a761b86 (patch) | |
| tree | 92ea3921151e8ee5d114cdc178dc901fc43563e5 | |
| parent | virtio-serial: Check if virtio queue is ready before consuming data (diff) | |
| download | qemu-fd11a78be8dfc992a5c642d8e2e1ebd80a761b86.tar.gz qemu-fd11a78be8dfc992a5c642d8e2e1ebd80a761b86.tar.xz qemu-fd11a78be8dfc992a5c642d8e2e1ebd80a761b86.zip | |
virtio-serial: Assert for virtio queue ready before virtqueue operations
In addition to the previous fix for calling do_flush_queued_data() only
when the virtqueue is ready, ensure do_flush_queued_data() gets a vq
that's suitably initialised.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/virtio-serial-bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 077c3183bc..8e611c03e0 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -117,6 +117,7 @@ static void do_flush_queued_data(VirtIOSerialPort *port, VirtQueue *vq, VirtQueueElement elem; assert(port || discard); + assert(virtio_queue_ready(vq)); while ((discard || !port->throttled) && virtqueue_pop(vq, &elem)) { uint8_t *buf; |