From patchwork Tue Jun 28 17:33:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 641661 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 3rfD1r1zwJz9sdb for ; Wed, 29 Jun 2016 03:53:36 +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=d73SN8Kp; dkim-atps=neutral Received: from localhost ([::1]:38508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHxCY-0007v3-5h for incoming@patchwork.ozlabs.org; Tue, 28 Jun 2016 13:53:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHwun-00011u-CE 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 1bHwui-0003GV-Cc for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:35:12 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHwui-0003FO-5r for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:35:08 -0400 Received: by mail-wm0-x241.google.com with SMTP id a66so7652010wme.2 for ; Tue, 28 Jun 2016 10:35:08 -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=4Pclh0UBbt82iFTfbt9sYOyWz6iFOMDIJUEd3yY7sUQ=; b=d73SN8Kp5fO2OxXnN1B6Y8Y5G2Ol+hFoM+3zQf7a04ayw5JXYU2qp+T7JodkmjrQYF e32nJw8soFqqyjmU/1oxDn7LkoWJs7uCfAd/V+kG5UcyAMzcDoAb4FTclvAQTd/TwwcB bm/FbTTMw3SAIxVmIyy94ADrk/QQ1AvK2ZQ0rsM5eDheM75lR4lBC0o8eI3aFkLiTUbi PzUQFQIlJ/WwNLS8qJp3H/MpXSrT47jzIkFomd2ayJuHabvjFJ4nhOssSFWBRtx92uWB 66pZb8F3HFx2U2e+UQoUDD8FnB4twioALupwJL3AJgcszb8eo0cZHYbgfUa2GloO9Jk/ zHsQ== 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=4Pclh0UBbt82iFTfbt9sYOyWz6iFOMDIJUEd3yY7sUQ=; b=l5TlvL7iayr49hBheN2oeOelEAbKCBMzCZWOYApv6sVszt9bCTESttbmVeaQKq2PZS PDbnDBD+JVlIFMvQx0Gzg1zLMSTz2tRIMeH3MGldwlnd2fAHlkEIx1YnTrjdctNdLUAg fPwJvpUAEDZ4dzyNqQZKTGUzRELs4GG+05i6KzesTk+eYX46cBGFUr0X+HnyvbMUT1HY YZnHq2s4rj0bd4atKDEJKGmVtxIQf9tABj1jIxzqysrs+qG8Ae9T6CIKt3x1trsECeCD CIMqAvDOpIukYT4dwluiPoSeZCusBrEnRLVCWCqTz4rwmzpdozb9HX2T005cH49/CUAG tohA== X-Gm-Message-State: ALyK8tKUFSTR95gWPm/Jku5p2HXofeP8XIdAKA25AN62ZBJ2Ig1PDTjjHAtRKKZJD3L1+Q== X-Received: by 10.194.54.102 with SMTP id i6mr4020799wjp.91.1467135307510; Tue, 28 Jun 2016 10:35:07 -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.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 10:35:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 28 Jun 2016 19:33:57 +0200 Message-Id: <1467135242-874-28-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 27/32] serial: separate serial_xmit and serial_watch_cb 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" serial_xmit starts transmission of whatever is in the transmitter register, THR or FIFO; serial_watch_cb is a wrapper around it and is only used as a qemu_chr_fe_add_watch callback. Tested-by: Bret Ketchum Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Paolo Bonzini --- hw/char/serial.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 904b218..0b09094 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -106,6 +106,7 @@ do {} while (0) #endif static void serial_receive1(void *opaque, const uint8_t *buf, int size); +static void serial_xmit(SerialState *s); static inline void recv_fifo_put(SerialState *s, uint8_t chr) { @@ -223,10 +224,16 @@ static void serial_update_msl(SerialState *s) } } -static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) +static gboolean serial_watch_cb(GIOChannel *chan, GIOCondition cond, + void *opaque) { SerialState *s = opaque; + serial_xmit(s); + return FALSE; +} +static void serial_xmit(SerialState *s) +{ do { assert(!(s->lsr & UART_LSR_TEMT)); if (s->tsr_retry == 0) { @@ -254,9 +261,9 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) } else if (qemu_chr_fe_write(s->chr, &s->tsr, 1) != 1) { if (s->tsr_retry < MAX_XMIT_RETRY && qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, - serial_xmit, s) > 0) { + serial_watch_cb, s) > 0) { s->tsr_retry++; - return FALSE; + return; } } s->tsr_retry = 0; @@ -267,11 +274,8 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) s->last_xmit_ts = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); s->lsr |= UART_LSR_TEMT; - - return FALSE; } - /* Setter for FCR. is_load flag means, that value is set while loading VM state and interrupt should not be invoked */ @@ -329,7 +333,7 @@ static void serial_ioport_write(void *opaque, hwaddr addr, uint64_t val, s->lsr &= ~UART_LSR_TEMT; serial_update_irq(s); if (s->tsr_retry == 0) { - serial_xmit(NULL, G_IO_OUT, s); + serial_xmit(s); } } break;