From patchwork Tue Apr 2 17:35:33 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: 233102 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 220272C00B2 for ; Wed, 3 Apr 2013 04:32:00 +1100 (EST) Received: from localhost ([::1]:53375 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN53u-0004WN-BI for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 13:31:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN53W-0004Ph-PL for qemu-devel@nongnu.org; Tue, 02 Apr 2013 13:31:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN53S-0001nw-RO for qemu-devel@nongnu.org; Tue, 02 Apr 2013 13:31:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20183) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN53S-0001ne-H5 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 13:31:30 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r32HVTsC007945 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 2 Apr 2013 13:31:29 -0400 Received: from localhost.localdomain.com (vpn1-6-230.ams2.redhat.com [10.36.6.230]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r32HVRKM030676; Tue, 2 Apr 2013 13:31:28 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Tue, 2 Apr 2013 19:35:33 +0200 Message-Id: <1364924133-10519-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1364924133-10519-1-git-send-email-hdegoede@redhat.com> References: <1364924133-10519-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] 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. 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 --- hw/virtio-console.c | 8 +++++--- hw/virtio-serial.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 3ad6774..908ec17 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -36,7 +36,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; @@ -49,7 +50,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); /* @@ -58,7 +59,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); if (!vcon->watch) { diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index 516400f..4dc0c0a 100644 --- a/hw/virtio-serial.h +++ b/hw/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; /*