From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2cx-0003BZ-SW for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:56:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US2cu-0005vk-N9 for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:56:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US2cu-0005vA-F5 for qemu-devel@nongnu.org; Tue, 16 Apr 2013 05:56:36 -0400 From: Gerd Hoffmann Date: Tue, 16 Apr 2013 11:56:29 +0200 Message-Id: <1366106194-28826-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1366106194-28826-1-git-send-email-kraxel@redhat.com> References: <1366106194-28826-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/9] virtio-console: Also throttle when less was written then requested List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , Hans de Goede , Anthony Liguori , Gerd Hoffmann From: Hans de Goede 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 Acked-by: Amit Shah Signed-off-by: Gerd Hoffmann --- 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