From 1e4476aa03b70e78b0dbc21cebd6e9f9c6835067 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Tue, 27 Apr 2010 18:04:09 +0530 Subject: virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse We cannot indicate to the guest how much data was consumed by an app for out_bufs. So we just have to assume the apps will consume all the data that are handed over to them. Fix the virtio api abuse in control_out() and handle_output(). Signed-off-by: Amit Shah Signed-off-by: Anthony Liguori --- hw/virtio-serial-bus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hw/virtio-serial-bus.c') diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 3053a35c39..ad44127154 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -335,7 +335,7 @@ static void control_out(VirtIODevice *vdev, VirtQueue *vq) copied = iov_to_buf(elem.out_sg, elem.out_num, buf, 0, len); handle_control_message(vser, buf, copied); - virtqueue_push(vq, &elem, copied); + virtqueue_push(vq, &elem, 0); } qemu_free(buf); virtio_notify(vdev, vq); @@ -379,11 +379,11 @@ static void handle_output(VirtIODevice *vdev, VirtQueue *vq) 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); + port->info->have_data(port, buf, ret); qemu_free(buf); next_buf: - virtqueue_push(vq, &elem, ret); + virtqueue_push(vq, &elem, 0); } virtio_notify(vdev, vq); } -- cgit 1.4.1