From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNsaE-0001fi-15 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 19:29:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNsa7-0003Sm-Tp for qemu-devel@nongnu.org; Wed, 12 Mar 2014 19:29:09 -0400 Received: from fldsmtpe04.verizon.com ([140.108.26.143]:17564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNsa7-0003Sd-Q3 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 19:29:03 -0400 From: Don Slutz Message-ID: <5320EDBD.7090805@terremark.com> Date: Wed, 12 Mar 2014 19:29:01 -0400 MIME-Version: 1.0 References: <1393469285-18091-1-git-send-email-dslutz@verizon.com> In-Reply-To: <1393469285-18091-1-git-send-email-dslutz@verizon.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/1] char/serial: Fix emptyness handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Don Slutz , qemu-devel@nongnu.org Cc: Peter Crosthwaite Ping. On 02/26/14 21:48, Don Slutz wrote: > 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. > Do full state change on fifo8_is_empty. > > Signed-off-by: Don Slutz > --- > v1 to v2: Do all the state changes that would have been done sending the NULL byte. > > hw/char/serial.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/hw/char/serial.c b/hw/char/serial.c > index 6d3b5af..7af3c1b 100644 > --- a/hw/char/serial.c > +++ b/hw/char/serial.c > @@ -225,8 +225,13 @@ 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)) { > + s->lsr |= UART_LSR_THRE | UART_LSR_TEMT; > + s->thr_ipending = 1; > + serial_update_irq(s); > + return FALSE; > + } > + s->tsr = fifo8_pop(&s->xmit_fifo); > if (!s->xmit_fifo.num) { > s->lsr |= UART_LSR_THRE; > }