| From a7f735cccb7d7b98998600eebc789c709eac5bca Mon Sep 17 00:00:00 2001 |
| From: Fam Zheng <famz@redhat.com> |
| Date: Thu, 18 May 2017 09:21:18 +0200 |
| Subject: [PATCH 05/18] char/serial: Fix emptyness check |
| |
| RH-Author: Fam Zheng <famz@redhat.com> |
| Message-id: <20170518092131.16571-6-famz@redhat.com> |
| Patchwork-id: 75296 |
| O-Subject: [RHEL-7.4 qemu-kvm PATCH v3 05/18] char/serial: Fix emptyness check |
| Bugzilla: 1451470 |
| RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com> |
| RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com> |
| RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com> |
| |
| From: Peter Crosthwaite <peter.crosthwaite@xilinx.com> |
| |
| This was guarding against a full fifo rather than an empty fifo when |
| popping. Fix. |
| |
| Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> |
| Reviewed-by: Martin Kletzander <mkletzan@redhat.com> |
| Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> |
| Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> |
| (cherry picked from commit 88c1ee73d3231c74ff90bcfc084a7589670ec244) |
| Signed-off-by: Fam Zheng <famz@redhat.com> |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| 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 3345de1..489a885 100644 |
| |
| |
| @@ -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.3.1 |
| |