diff options
| author | Don Slutz | 2014-03-18 17:29:34 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-04-07 15:51:32 +0200 |
| commit | dffacd4654ec8bf2898aed230852154c6ed755ed (patch) | |
| tree | 59a035187ef385753a78b0b1175d99ff8cc0f6a7 /hw | |
| parent | Merge remote-tracking branch 'remotes/spice/tags/pull-spice-6' into staging (diff) | |
| download | qemu-dffacd4654ec8bf2898aed230852154c6ed755ed.tar.gz qemu-dffacd4654ec8bf2898aed230852154c6ed755ed.tar.xz qemu-dffacd4654ec8bf2898aed230852154c6ed755ed.zip | |
char/serial: Fix emptyness handling
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 <peter.crosthwaite@xilinx.com>
Signed-off-by: Don Slutz <dslutz@verizon.com>
Message-id: 1395160174-16006-1-git-send-email-dslutz@verizon.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/char/serial.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/char/serial.c b/hw/char/serial.c index 6d3b5aff8b..f4d167f916 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; } |