qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v3 1/1] char/serial: Fix emptyness handling
@ 2014-03-18 16:29 Don Slutz
  2014-03-28 11:43 ` Don Slutz
  0 siblings, 1 reply; 6+ messages in thread
From: Don Slutz @ 2014-03-18 16:29 UTC (permalink / raw)
  To: qemu-devel; +Cc: Peter Crosthwaite, Don Slutz

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>
---
Changes V2 to v3
  Revert v2 changes
  Fix coding style issues.
Changes v1 to v2
  Do full state change on fifo8_is_empty.
 

 hw/char/serial.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 6d3b5af..f4d167f 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;
             }
-- 
1.8.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-04-07 14:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-18 16:29 [Qemu-devel] [PATCH v3 1/1] char/serial: Fix emptyness handling Don Slutz
2014-03-28 11:43 ` Don Slutz
2014-03-28 12:10   ` Paolo Bonzini
2014-04-04 12:13     ` Peter Crosthwaite
2014-04-04 23:14       ` [Qemu-devel] [PATCH for-2.0 " Brian Jackson
2014-04-07 14:16       ` [Qemu-devel] [PATCH " Peter Maydell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).