From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8DABC432C1 for ; Wed, 25 Sep 2019 09:01:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 783FD214DA for ; Wed, 25 Sep 2019 09:01:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 783FD214DA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD3Ae-0003Xj-Pg for qemu-devel@archiver.kernel.org; Wed, 25 Sep 2019 05:01:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56937) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD38r-0002Z5-RH for qemu-devel@nongnu.org; Wed, 25 Sep 2019 04:59:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iD38p-0004Uq-Mk for qemu-devel@nongnu.org; Wed, 25 Sep 2019 04:59:21 -0400 Received: from 6.mo177.mail-out.ovh.net ([46.105.51.249]:55203) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iD37Z-0003k6-M6 for qemu-devel@nongnu.org; Wed, 25 Sep 2019 04:59:19 -0400 Received: from player692.ha.ovh.net (unknown [10.108.57.153]) by mo177.mail-out.ovh.net (Postfix) with ESMTP id 48D7710C32C for ; Wed, 25 Sep 2019 10:57:59 +0200 (CEST) Received: from kaod.org (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player692.ha.ovh.net (Postfix) with ESMTPSA id 11D2DA144A75; Wed, 25 Sep 2019 08:57:48 +0000 (UTC) Date: Wed, 25 Sep 2019 10:57:47 +0200 From: Greg Kurz To: David Gibson Subject: Re: [PATCH 08/20] spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper Message-ID: <20190925105747.6ecbcd6e@bahia.lan> In-Reply-To: <20190925064534.19155-9-david@gibson.dropbear.id.au> References: <20190925064534.19155-1-david@gibson.dropbear.id.au> <20190925064534.19155-9-david@gibson.dropbear.id.au> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 3177008063372040678 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrfedvgddutdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.51.249 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Riku Voipio , qemu-devel@nongnu.org, Laurent Vivier , qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau , Paolo Bonzini , philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 25 Sep 2019 16:45:22 +1000 David Gibson wrote: > Every caller of spapr_vio_qirq() immediately calls qemu_irq_pulse() with > the result, so we might as well just fold that into the helper. > > Signed-off-by: David Gibson > --- Reviewed-by: Greg Kurz > hw/char/spapr_vty.c | 3 +-- > hw/net/spapr_llan.c | 3 +-- > hw/ppc/spapr_vio.c | 3 +-- > include/hw/ppc/spapr_vio.h | 5 +++-- > 4 files changed, 6 insertions(+), 8 deletions(-) > > diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c > index 087c93e4fa..8f4d9fe472 100644 > --- a/hw/char/spapr_vty.c > +++ b/hw/char/spapr_vty.c > @@ -5,7 +5,6 @@ > #include "cpu.h" > #include "migration/vmstate.h" > #include "chardev/char-fe.h" > -#include "hw/irq.h" > #include "hw/ppc/spapr.h" > #include "hw/ppc/spapr_vio.h" > #include "hw/qdev-properties.h" > @@ -37,7 +36,7 @@ static void vty_receive(void *opaque, const uint8_t *buf, int size) > > if ((dev->in == dev->out) && size) { > /* toggle line to simulate edge interrupt */ > - qemu_irq_pulse(spapr_vio_qirq(&dev->sdev)); > + spapr_vio_irq_pulse(&dev->sdev); > } > for (i = 0; i < size; i++) { > if (dev->in - dev->out >= VTERM_BUFSIZE) { > diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c > index 701e6e1514..3d96884d66 100644 > --- a/hw/net/spapr_llan.c > +++ b/hw/net/spapr_llan.c > @@ -27,7 +27,6 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "hw/irq.h" > #include "qemu/log.h" > #include "qemu/module.h" > #include "net/net.h" > @@ -267,7 +266,7 @@ static ssize_t spapr_vlan_receive(NetClientState *nc, const uint8_t *buf, > } > > if (sdev->signal_state & 1) { > - qemu_irq_pulse(spapr_vio_qirq(sdev)); > + spapr_vio_irq_pulse(sdev); > } > > return size; > diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c > index 0803649658..554de9930d 100644 > --- a/hw/ppc/spapr_vio.c > +++ b/hw/ppc/spapr_vio.c > @@ -23,7 +23,6 @@ > #include "qemu/error-report.h" > #include "qapi/error.h" > #include "qapi/visitor.h" > -#include "hw/irq.h" > #include "qemu/log.h" > #include "hw/loader.h" > #include "elf.h" > @@ -294,7 +293,7 @@ int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq) > dev->crq.qnext = (dev->crq.qnext + 16) % dev->crq.qsize; > > if (dev->signal_state & 1) { > - qemu_irq_pulse(spapr_vio_qirq(dev)); > + spapr_vio_irq_pulse(dev); > } > > return 0; > diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h > index 875be28cdd..72762ed16b 100644 > --- a/include/hw/ppc/spapr_vio.h > +++ b/include/hw/ppc/spapr_vio.h > @@ -24,6 +24,7 @@ > > #include "hw/ppc/spapr.h" > #include "sysemu/dma.h" > +#include "hw/irq.h" > > #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device" > #define VIO_SPAPR_DEVICE(obj) \ > @@ -84,11 +85,11 @@ extern SpaprVioDevice *spapr_vio_find_by_reg(SpaprVioBus *bus, uint32_t reg); > void spapr_dt_vdevice(SpaprVioBus *bus, void *fdt); > extern gchar *spapr_vio_stdout_path(SpaprVioBus *bus); > > -static inline qemu_irq spapr_vio_qirq(SpaprVioDevice *dev) > +static inline void spapr_vio_irq_pulse(SpaprVioDevice *dev) > { > SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); > > - return spapr_qirq(spapr, dev->irq); > + qemu_irq_pulse(spapr_qirq(spapr, dev->irq)); > } > > static inline bool spapr_vio_dma_valid(SpaprVioDevice *dev, uint64_t taddr,