From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1vCA-0002U8-P2 for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:31:26 -0400 Received: from [140.186.70.92] (port=49128 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1vC8-0002TD-Tn for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:31:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1vC7-00064J-9M for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:31:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53440) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1vC7-00064D-20 for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:31:23 -0400 From: Amit Shah Date: Wed, 14 Apr 2010 10:58:34 +0530 Message-Id: <1271222917-7803-15-git-send-email-amit.shah@redhat.com> In-Reply-To: <1271222917-7803-14-git-send-email-amit.shah@redhat.com> References: <1271222917-7803-1-git-send-email-amit.shah@redhat.com> <1271222917-7803-2-git-send-email-amit.shah@redhat.com> <1271222917-7803-3-git-send-email-amit.shah@redhat.com> <1271222917-7803-4-git-send-email-amit.shah@redhat.com> <1271222917-7803-5-git-send-email-amit.shah@redhat.com> <1271222917-7803-6-git-send-email-amit.shah@redhat.com> <1271222917-7803-7-git-send-email-amit.shah@redhat.com> <1271222917-7803-8-git-send-email-amit.shah@redhat.com> <1271222917-7803-9-git-send-email-amit.shah@redhat.com> <1271222917-7803-10-git-send-email-amit.shah@redhat.com> <1271222917-7803-11-git-send-email-amit.shah@redhat.com> <1271222917-7803-12-git-send-email-amit.shah@redhat.com> <1271222917-7803-13-git-send-email-amit.shah@redhat.com> <1271222917-7803-14-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH v5 14/17] virtio-serial: Handle scatter/gather input from the guest List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu list , Amit Shah , Avi Kivity , Gerd Hoffmann , Juan Quintela Current guests don't send more than one iov but it can change later. Ensure we handle that case. Signed-off-by: Amit Shah CC: Avi Kivity --- hw/virtio-serial-bus.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index b8410c3..3053a35 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -351,7 +351,8 @@ static void handle_output(VirtIODevice *vdev, VirtQueue *vq) while (virtqueue_pop(vq, &elem)) { VirtIOSerialPort *port; - size_t ret; + uint8_t *buf; + size_t ret, buf_size; port = find_port_by_vq(vser, vq); if (!port) { @@ -374,9 +375,12 @@ static void handle_output(VirtIODevice *vdev, VirtQueue *vq) goto next_buf; } - /* The guest always sends only one sg */ - ret = port->info->have_data(port, elem.out_sg[0].iov_base, - elem.out_sg[0].iov_len); + buf_size = iov_size(elem.out_sg, elem.out_num); + buf = qemu_malloc(buf_size); + ret = iov_to_buf(elem.out_sg, elem.out_num, buf, 0, buf_size); + + ret = port->info->have_data(port, buf, ret); + qemu_free(buf); next_buf: virtqueue_push(vq, &elem, ret); -- 1.6.2.5