From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULVeY-0000qz-IY for qemu-devel@nongnu.org; Fri, 29 Mar 2013 05:31:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULVeX-0005RT-LQ for qemu-devel@nongnu.org; Fri, 29 Mar 2013 05:31:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12282) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULVeX-0005RL-Di for qemu-devel@nongnu.org; Fri, 29 Mar 2013 05:31:17 -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 r2T9VGrp016925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 29 Mar 2013 05:31:16 -0400 Date: Fri, 29 Mar 2013 15:01:14 +0530 From: Amit Shah Message-ID: <20130329093114.GA14019@amit.redhat.com> References: <1364477297-2083-1-git-send-email-hdegoede@redhat.com> <1364477297-2083-2-git-send-email-hdegoede@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1364477297-2083-2-git-send-email-hdegoede@redhat.com> Subject: Re: [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: Hans de Goede Cc: Gerd Hoffmann , qemu-devel@nongnu.org On (Thu) 28 Mar 2013 [14:28:11], Hans de Goede wrote: > 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) { Oops, there's a conversion bug here: len is size_t, and ret is ssize_t. Both need to be the same type. Since we're not returning negative, ret should be changed to size_t. The function signature changes too, but that's alright. > 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; And there need to be braces here. Amit