From patchwork Tue Jun 28 17:33:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 641666 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rfD7T2T5tz9sdg for ; Wed, 29 Jun 2016 03:58:29 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=h91lWrp/; dkim-atps=neutral Received: from localhost ([::1]:38535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHxHH-0004bK-8d for incoming@patchwork.ozlabs.org; Tue, 28 Jun 2016 13:58:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHwul-0000z4-RY for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHwug-0003D4-8t for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:35:10 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHwug-0003CX-2X for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:35:06 -0400 Received: by mail-wm0-x241.google.com with SMTP id 187so7681000wmz.1 for ; Tue, 28 Jun 2016 10:35:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=aYxPN+9lL6XVGaWooXKh5oFKjaB51+4FWiov7VCCOrA=; b=h91lWrp/kM4cvXPS7uguMUOTbEtkxzIN7qx+2zXMQlTgkoTbTgljcopk1prNWhmrOl DuXGke+X0RaKAXG67tKlYhiHVxx2i2KIbsalG7FUjJAm1/bKCUxeAVGzuTH7BX8J4NvK haysOrKF2xlbNI49DFHiq1Q1LtSDSmBt54+UiUYet8wsbr9bzNVpYzGgiew+lx4onYLe 3sTWO654oCzcvzHKKQttkjCu55vM8q2tdXB5YEY4RoCTot9T6PJez/Pn/N3HZR9OrWn1 qI7UZOpeoNp+VksYR2PE/PGgJFXTKC0ynBxxpWvJXw04cxg+EziVLDTPSPliYZmHtDVN K80g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=aYxPN+9lL6XVGaWooXKh5oFKjaB51+4FWiov7VCCOrA=; b=WhtUZEEBJ9L8VPCkaoXp2lAy4Nwps6ZmGy3gzlRpZU6Jua9y86px7+6sOeWTitY9Sb agvEjoZkB4Bo19v8HgmOVtw1iJ6mB135HfV/pNB7RtzpyFxR6x8kdwFPInIuP8xWPXR/ oU/rA+PYkwrc+eISndRh2wFM+GiUY4mq87n+eZ1m6J/51Ob2O4nWKehIaKsunjnIyzIb ZlWI92XK17WBiIUPdF1xBd7u98Kql3vgGImXRu97XVMp+937IthoENBmLnMAx1cyLiCD 6vl9Gd/GIDTtZ1mfC3XC9S8qmK+5/1uTbOP8Oacs3Rg+wKkaXPOTPkkD+SeRIAKK5MI6 T55g== X-Gm-Message-State: ALyK8tJzKbVGvgnuWGqJHRj4p4xOGNrtB8uag0NXlbGmgvFO4pPy7hZkRq/rr+EDgswhYw== X-Received: by 10.194.82.36 with SMTP id f4mr4282467wjy.104.1467135305362; Tue, 28 Jun 2016 10:35:05 -0700 (PDT) Received: from donizetti.lan (94-39-188-118.adsl-ull.clienti.tiscali.it. [94.39.188.118]) by smtp.gmail.com with ESMTPSA id c142sm5305wme.18.2016.06.28.10.35.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 10:35:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 28 Jun 2016 19:33:55 +0200 Message-Id: <1467135242-874-26-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467135242-874-1-git-send-email-pbonzini@redhat.com> References: <1467135242-874-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 25/32] serial: make tsr_retry unsigned X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It can never become negative; reflect this in the type of the field and simplify the conditions. Tested-by: Bret Ketchum Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Paolo Bonzini --- hw/char/serial.c | 12 ++++++++---- include/hw/char/serial.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 6d815b5..e65e9e0 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -229,7 +229,7 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) do { assert(!(s->lsr & UART_LSR_TEMT)); - if (s->tsr_retry <= 0) { + if (s->tsr_retry == 0) { assert(!(s->lsr & UART_LSR_THRE)); if (s->fcr & UART_FCR_FE) { @@ -252,7 +252,7 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) /* in loopback mode, say that we just received a char */ serial_receive1(s, &s->tsr, 1); } else if (qemu_chr_fe_write(s->chr, &s->tsr, 1) != 1) { - if (s->tsr_retry >= 0 && s->tsr_retry < MAX_XMIT_RETRY && + if (s->tsr_retry < MAX_XMIT_RETRY && qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, serial_xmit, s) > 0) { s->tsr_retry++; @@ -330,7 +330,7 @@ static void serial_ioport_write(void *opaque, hwaddr addr, uint64_t val, s->lsr &= ~UART_LSR_THRE; s->lsr &= ~UART_LSR_TEMT; serial_update_irq(s); - if (s->tsr_retry <= 0) { + if (s->tsr_retry == 0) { serial_xmit(NULL, G_IO_OUT, s); } } @@ -639,6 +639,10 @@ static int serial_post_load(void *opaque, int version_id) if (s->thr_ipending == -1) { s->thr_ipending = ((s->iir & UART_IIR_ID) == UART_IIR_THRI); } + if (s->tsr_retry > MAX_XMIT_RETRY) { + s->tsr_retry = MAX_XMIT_RETRY; + } + s->last_break_enable = (s->lcr >> 6) & 1; /* Initialize fcr via setter to perform essential side-effects */ serial_write_fcr(s, s->fcr_vmstate); @@ -685,7 +689,7 @@ static const VMStateDescription vmstate_serial_tsr = { .minimum_version_id = 1, .needed = serial_tsr_needed, .fields = (VMStateField[]) { - VMSTATE_INT32(tsr_retry, SerialState), + VMSTATE_UINT32(tsr_retry, SerialState), VMSTATE_UINT8(thr, SerialState), VMSTATE_UINT8(tsr, SerialState), VMSTATE_END_OF_LIST() diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 15beb6b..6a322eb 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -55,7 +55,7 @@ struct SerialState { int last_break_enable; int it_shift; int baudbase; - int tsr_retry; + uint32_t tsr_retry; uint32_t wakeup; /* Time when the last byte was successfully sent out of the tsr */