From patchwork Wed Apr 14 05:28:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v5,14/17] virtio-serial: Handle scatter/gather input from the guest Date: Tue, 13 Apr 2010 19:28:34 -0000 From: Amit Shah X-Patchwork-Id: 50112 Message-Id: <1271222917-7803-15-git-send-email-amit.shah@redhat.com> 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);