From patchwork Thu Jul 1 09:28:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] virtio-serial: Assert for virtio queue ready before virtqueue operations Date: Wed, 30 Jun 2010 23:28:17 -0000 From: Amit Shah X-Patchwork-Id: 57496 Message-Id: <8ce10459eabf04b762594fcf9a392e87e42f7ae0.1277976486.git.amit.shah@redhat.com> To: qemu list Cc: Amit Shah 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 --- 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 b89daa6..93cffa2 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;