From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGBv8-0001qc-6z for qemu-devel@nongnu.org; Wed, 19 Feb 2014 13:31:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGBv1-0006Zy-02 for qemu-devel@nongnu.org; Wed, 19 Feb 2014 13:30:58 -0500 Received: from fldsmtpe04.verizon.com ([140.108.26.143]:45796) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGBv0-0006Zi-PK for qemu-devel@nongnu.org; Wed, 19 Feb 2014 13:30:50 -0500 From: Don Slutz Date: Wed, 19 Feb 2014 13:30:40 -0500 Message-Id: <1392834640-15488-1-git-send-email-dslutz@verizon.com> Subject: [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite , Don Slutz The commit 88c1ee73d3231c74ff90bcfc084a7589670ec244 char/serial: Fix emptyness check Still causes extra NULL byte(s) to be sent. So if the fifo is empty, do not send an extra NULL byte. Signed-off-by: Don Slutz --- hw/char/serial.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 6d3b5af..6df5a53 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -225,8 +225,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) if (s->tsr_retry <= 0) { if (s->fcr & UART_FCR_FE) { - s->tsr = fifo8_is_empty(&s->xmit_fifo) ? - 0 : fifo8_pop(&s->xmit_fifo); + if (fifo8_is_empty(&s->xmit_fifo)) + return FALSE; + s->tsr = fifo8_pop(&s->xmit_fifo); if (!s->xmit_fifo.num) { s->lsr |= UART_LSR_THRE; } -- 1.8.4