diff options
| author | Amit Shah <amit.shah@redhat.com> | 2010-04-27 18:04:08 +0530 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-04-28 08:58:22 -0500 |
| commit | e85ba9b2dce43d706e21135fc1bf21a30601c2cf (patch) | |
| tree | 0db2713c4a892e6c8f6d5ade2bb4054de301dfff /hw/virtio-serial-bus.c | |
| parent | e61da14d60ba1cceacad8396adcb9662c7f690af (diff) | |
| download | qemu-e85ba9b2dce43d706e21135fc1bf21a30601c2cf.tar.gz | |
virtio-serial: Handle scatter/gather input from the guest
Current guests don't send more than one iov but it can change later.
Ensure we handle that case.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
CC: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/virtio-serial-bus.c')
| -rw-r--r-- | 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 b8410c3bb8..3053a35c39 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); |