From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCp8-0001l9-VQ for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:25:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULCp3-0007UX-6U for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:24:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCp2-0007UD-Rb for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:24:53 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2SDOqUO014311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 28 Mar 2013 09:24:52 -0400 From: Hans de Goede Date: Thu, 28 Mar 2013 14:28:11 +0100 Message-Id: <1364477297-2083-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1364477297-2083-1-git-send-email-hdegoede@redhat.com> References: <1364477297-2083-1-git-send-email-hdegoede@redhat.com> Subject: [Qemu-devel] [PATCH 1/7] virtio-console: Also throttle when less was written then requested List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: Amit Shah , Hans de Goede , qemu-devel@nongnu.org This is necessary so that we get properly woken up to write the rest. Signed-off-by: Hans de Goede Acked-by: Amit Shah --- hw/virtio-console.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 284180f..015947c 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -47,7 +47,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 +56,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, -- 1.8.1.4