From patchwork Wed Mar 13 13:59:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 227294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 176F02C0098 for ; Thu, 14 Mar 2013 00:58:26 +1100 (EST) Received: from localhost ([::1]:57971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFmCG-0001fN-B3 for incoming@patchwork.ozlabs.org; Wed, 13 Mar 2013 09:58:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFmAW-0007g2-HQ for qemu-devel@nongnu.org; Wed, 13 Mar 2013 09:56:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFmAT-0002fR-1U for qemu-devel@nongnu.org; Wed, 13 Mar 2013 09:56:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFmAS-0002fK-P5 for qemu-devel@nongnu.org; Wed, 13 Mar 2013 09:56:32 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2DDuWxq018676 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 13 Mar 2013 09:56:32 -0400 Received: from shalem.localdomain.com (vpn1-7-240.ams2.redhat.com [10.36.7.240]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2DDuSJh003674; Wed, 13 Mar 2013 09:56:30 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Wed, 13 Mar 2013 14:59:41 +0100 Message-Id: <1363183187-16258-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1363183187-16258-1-git-send-email-hdegoede@redhat.com> References: <1363183187-16258-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Hans de Goede , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Subject: [Qemu-devel] [PATCH 1/7] virtio-console: Also throttle when less was written then requested X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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 e2d1c58..1d87c5b 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,