Re: [Qemu-devel] [PATCH bugfix v1 1/1] char/serial: Fix emptyness check

[Dr. David Alan Gilbert]

* Peter Crosthwaite (address@hidden) wrote:
> This was guarding against a full fifo rather than an empty fifo when
> popping. Fix.
> 
> Signed-off-by: Peter Crosthwaite <address@hidden>
> ---

Reviewed-by: Dr. David Alan Gilbert <address@hidden>

I think this brings it back to how it was on the old FIFO code.

> 
>  hw/char/serial.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/char/serial.c b/hw/char/serial.c
> index 27dab7d..6d3b5af 100644
> --- a/hw/char/serial.c
> +++ b/hw/char/serial.c
> @@ -225,7 +225,7 @@ 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_full(&s->xmit_fifo) ?
> +            s->tsr = fifo8_is_empty(&s->xmit_fifo) ?
>                          0 : fifo8_pop(&s->xmit_fifo);
>              if (!s->xmit_fifo.num) {
>                  s->lsr |= UART_LSR_THRE;
> -- 
> 1.8.5.4
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK