[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/17] virtio-serial: Apps should consume all data t
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH 15/17] virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse |
Date: |
Wed, 31 Mar 2010 13:04:06 +0530 |
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 <address@hidden>
---
hw/virtio-console.c | 7 ++-----
hw/virtio-serial-bus.c | 6 +++---
hw/virtio-serial.h | 6 +++---
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/hw/virtio-console.c b/hw/virtio-console.c
index bbbb6b8..caea11f 100644
--- a/hw/virtio-console.c
+++ b/hw/virtio-console.c
@@ -20,14 +20,11 @@ typedef struct VirtConsole {
/* Callback function that's called when the guest sends us data */
-static size_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
+static void flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
{
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
- ssize_t ret;
- ret = qemu_chr_write(vcon->chr, buf, len);
-
- return ret < 0 ? 0 : ret;
+ qemu_chr_write(vcon->chr, buf, len);
}
/* Readiness of the guest to accept data on a port */
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 49a6baa..7ac46f5 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -336,7 +336,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);
}
if (len) {
qemu_free(buf);
@@ -382,11 +382,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);
}
diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h
index f023873..62d76a2 100644
--- a/hw/virtio-serial.h
+++ b/hw/virtio-serial.h
@@ -136,10 +136,10 @@ struct VirtIOSerialPortInfo {
/*
* Guest wrote some data to the port. This data is handed over to
- * the app via this callback. The app should return the number of
- * bytes it successfully consumed.
+ * the app via this callback. The app is supposed to consume all
+ * the data that is presented to it.
*/
- size_t (*have_data)(VirtIOSerialPort *port, const uint8_t *buf, size_t
len);
+ void (*have_data)(VirtIOSerialPort *port, const uint8_t *buf, size_t len);
};
/* Interface to the virtio-serial bus */
--
1.6.2.5
- [Qemu-devel] [PATCH 05/17] virtio-serial: Use control messages to notify guest of new ports, (continued)
- [Qemu-devel] [PATCH 05/17] virtio-serial: Use control messages to notify guest of new ports, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 06/17] virtio-serial: whitespace: match surrounding code, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 07/17] virtio-serial: Remove redundant check for 0-sized write request, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 08/17] virtio-serial: Update copyright year to 2010, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 09/17] virtio-serial: Propagate errors in initialising ports / devices in guest, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 10/17] virtio-serial: Send out guest data to ports only if port is opened, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 11/17] iov: Introduce a new file for helpers around iovs, add iov_from_buf(), Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 12/17] iov: Add iov_to_buf and iov_size helpers, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 13/17] virtio-serial: Handle scatter-gather buffers for control messages, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 14/17] virtio-serial: Handle scatter/gather input from the guest, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 15/17] virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse,
Amit Shah <=
- [Qemu-devel] [PATCH 16/17] virtio-serial: Discard data that guest sends us when ports aren't connected, Amit Shah, 2010/03/31
- [Qemu-devel] [PATCH 17/17] virtio-serial: Implement flow control for individual ports, Amit Shah, 2010/03/31
- [Qemu-devel] Re: [PATCH 16/17] virtio-serial: Discard data that guest sends us when ports aren't connected, Juan Quintela, 2010/03/31
- Re: [Qemu-devel] [PATCH 15/17] virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse, Gerd Hoffmann, 2010/03/31
- Re: [Qemu-devel] [PATCH 15/17] virtio-serial: Apps should consume all data that guest sends out / Fix virtio api abuse, Amit Shah, 2010/03/31
[Qemu-devel] Re: [PATCH 00/17] v4: virtio-serial fixes, new abi for port discovery, Juan Quintela, 2010/03/31