From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bF0CS-000852-Bu for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:29:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bF0CP-0003Bl-5u for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:29:15 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bF0CO-0003Bd-Vv for qemu-devel@nongnu.org; Mon, 20 Jun 2016 10:29:13 -0400 Received: by mail-wm0-x244.google.com with SMTP id a66so9445977wme.2 for ; Mon, 20 Jun 2016 07:29:12 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 20 Jun 2016 16:29:03 +0200 Message-Id: <1466432945-28682-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1466432945-28682-1-git-send-email-pbonzini@redhat.com> References: <1466432945-28682-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] serial: simplify tsr_retry reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com, bcketchum@gmail.com Move common code outside the if, and reset tsr_retry even in loopback mode. Right now it cannot become non-zero, but it will be possible as soon as we start respecting the baud rate. Signed-off-by: Paolo Bonzini --- hw/char/serial.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 4196a2e..d232473 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -265,10 +265,8 @@ static void serial_xmit(SerialState *s) s->tsr_retry++; return; } - s->tsr_retry = 0; - } else { - s->tsr_retry = 0; } + s->tsr_retry = 0; /* Transmit another byte if it is already available. It is only possible when FIFO is enabled and not empty. */ -- 2.5.5