[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/9] virtio-console: Also throttle when less was wri
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 4/9] virtio-console: Also throttle when less was written then requested |
Date: |
Tue, 16 Apr 2013 11:56:29 +0200 |
From: Hans de Goede <address@hidden>
This is necessary so that we get properly woken up to write the rest.
This patch also changes the len argument to the have_data callback, to
avoid doing an unsigned signed comparison.
Signed-off-by: Hans de Goede <address@hidden>
Acked-by: Amit Shah <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/char/virtio-console.c | 8 +++++---
include/hw/virtio/virtio-serial.h | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 5035030..061f4bd 100644
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -34,7 +34,8 @@ static gboolean chr_write_unblocked(GIOChannel *chan,
GIOCondition cond,
}
/* Callback function that's called when the guest sends us data */
-static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t
len)
+static ssize_t flush_buf(VirtIOSerialPort *port,
+ const uint8_t *buf, ssize_t len)
{
VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
ssize_t ret;
@@ -47,7 +48,7 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const
uint8_t *buf, size_t len)
ret = qemu_chr_fe_write(vcon->chr, buf, len);
trace_virtio_console_flush_buf(port->id, len, ret);
- if (ret <= 0) {
+ if (ret < len) {
VirtIOSerialPortClass *k = VIRTIO_SERIAL_PORT_GET_CLASS(port);
/*
@@ -56,7 +57,8 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const
uint8_t *buf, size_t len)
* we had a finer-grained message, like -EPIPE, we could close
* this connection.
*/
- ret = 0;
+ if (ret < 0)
+ ret = 0;
if (!k->is_console) {
virtio_serial_throttle_port(port, true);
qemu_chr_fe_add_watch(vcon->chr, G_IO_OUT, chr_write_unblocked,
diff --git a/include/hw/virtio/virtio-serial.h
b/include/hw/virtio/virtio-serial.h
index 7c71304..1d2040b 100644
--- a/include/hw/virtio/virtio-serial.h
+++ b/include/hw/virtio/virtio-serial.h
@@ -104,7 +104,7 @@ typedef struct VirtIOSerialPortClass {
* 'len'. In this case, throttling will be enabled for this port.
*/
ssize_t (*have_data)(VirtIOSerialPort *port, const uint8_t *buf,
- size_t len);
+ ssize_t len);
} VirtIOSerialPortClass;
/*
--
1.7.9.7
- [Qemu-devel] [PULL 0/9] spice patch queue, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 1/9] qxl: add 4k + 8k resolutions, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 2/9] qxl: add 2000x2000 and 2048x2048 video modes, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 3/9] spice: (32 bit only) fix surface cmd tracking destruction, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 5/9] virtio-console: Remove any pending watches on close, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 6/9] spice-qemu-char: Remove #ifdef-ed code for old spice-server compat, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 8/9] spice-qemu-char: Remove intermediate buffer, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 4/9] virtio-console: Also throttle when less was written then requested,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 7/9] spice-qemu-char: Add watch support, Gerd Hoffmann, 2013/04/16
- [Qemu-devel] [PATCH 9/9] spice-qemu-char: vmc_write: Don't write more bytes then we're asked too, Gerd Hoffmann, 2013/04/16