From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPwth-0005fY-6c for qemu-devel@nongnu.org; Tue, 18 Mar 2014 12:29:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPwtb-0003YU-76 for qemu-devel@nongnu.org; Tue, 18 Mar 2014 12:29:49 -0400 Received: from omzsmtpe04.verizonbusiness.com ([199.249.25.207]:36119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPwtb-0003YJ-2O for qemu-devel@nongnu.org; Tue, 18 Mar 2014 12:29:43 -0400 From: Don Slutz Date: Tue, 18 Mar 2014 12:29:34 -0400 Message-Id: <1395160174-16006-1-git-send-email-dslutz@verizon.com> Subject: [Qemu-devel] [PATCH v3 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. Reviewed-by: Peter Crosthwaite Signed-off-by: Don Slutz --- Changes V2 to v3 Revert v2 changes Fix coding style issues. Changes v1 to v2 Do full state change on fifo8_is_empty. hw/char/serial.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 6d3b5af..f4d167f 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -225,8 +225,10 @@ 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