Re: [Qemu-devel] [PATCH 1/1] char/serial: Fix emptyness handling

[Peter Crosthwaite]

On Thu, Feb 20, 2014 at 4:30 AM, Don Slutz <address@hidden> 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.
>
> Signed-off-by: Don Slutz <address@hidden>

Reviewed-by: Peter Crosthwaite <address@hidden>

> ---
>  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
>
>