From nobody Wed Nov 12 10:10:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1569565265; cv=none; d=zoho.com; s=zohoarc; b=R2NbykvNoFnWf1PH+HEYqeOwsMPyyD8V+m03Ty2hd6TjFUF7BtYLie/JAmvC2wid4quFoo+yJWzl4aLbIlzx9B1+m3d9PtmN7aHucWXW2e1prsiCWs8Ug7HclIGcJh+J/cPY/5ytA0r8GUMiqkNAYsfeiPv0FFSm2SO42mfDySw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569565265; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Xrhzo2HuBvES3WKNjmMt+z/TY+Kd4yWYhiIjLwsxLiY=; b=hb981SNjhhXyIQOv+6695kxo8TSu6ymG003iJviRu+qqefMlky/oKLRJpeLktSEcf/WJUZgCV6yDjjZjS+3yKBKCfIIG+a+yt118RApctPsCrnhP/ksD6qNKxdG2bwHi3JD1nbWjQsJoVo5yiXzkAaDaPldXfj9TBHV5LDh5RRU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569565265297137.35553143313462; Thu, 26 Sep 2019 23:21:05 -0700 (PDT) Received: from localhost ([::1]:46606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDjFD-0004YC-Os for importer@patchew.org; Fri, 27 Sep 2019 01:56:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47454) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDj9R-0006l9-Dj for qemu-devel@nongnu.org; Fri, 27 Sep 2019 01:50:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDj9P-0004zk-OV for qemu-devel@nongnu.org; Fri, 27 Sep 2019 01:50:45 -0400 Received: from ozlabs.org ([203.11.71.1]:50385) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDj9P-0004xJ-At; Fri, 27 Sep 2019 01:50:43 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46fgrD1BB3z9sPq; Fri, 27 Sep 2019 15:50:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1569563436; bh=/5Nm5thvXI+EGLou5HdDANHewnIqufQSVd7kPKxk82w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ovt0pWrBwnI3mV7NwZg5QgVSpYfxH3zH6VabNJmn4pk6Xlm5oEqFSn/61ZxdFy3HX T1O2wuaWps3tk/eJ92dZ8PuIj/mWR7mtBTuULcxsC6G9UCyijJiq4S9ZvQlW3KUkB2 hNN3c4ygYjR64Y2paTpVE5mu0arlgkUEvL2tLqOc= From: David Gibson To: qemu-devel@nongnu.org, clg@kaod.org, qemu-ppc@nongnu.org Subject: [PATCH v2 07/33] spapr: Fold spapr_phb_lsi_qirq() into its single caller Date: Fri, 27 Sep 2019 15:50:02 +1000 Message-Id: <20190927055028.11493-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190927055028.11493-1-david@gibson.dropbear.id.au> References: <20190927055028.11493-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 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 , groug@kaod.org, Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , philmd@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" No point having a two-line helper that's used exactly once, and not likely to be used anywhere else in future. Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr_pci.c | 3 ++- include/hw/pci-host/spapr.h | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 7b71ad7c74..6934d506a7 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -721,9 +721,10 @@ static void pci_spapr_set_irq(void *opaque, int irq_nu= m, int level) * corresponding qemu_irq. */ SpaprPhbState *phb =3D opaque; + SpaprMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); =20 trace_spapr_pci_lsi_set(phb->dtbusname, irq_num, phb->lsi_table[irq_nu= m].irq); - qemu_set_irq(spapr_phb_lsi_qirq(phb, irq_num), level); + qemu_set_irq(spapr_qirq(spapr, phb->lsi_table[irq_num].irq), level); } =20 static PCIINTxRoute spapr_route_intx_pin_to_irq(void *opaque, int pin) diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index abd87605b2..23506f05d9 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -128,13 +128,6 @@ struct SpaprPhbState { #define SPAPR_PCI_NV2ATSD_WIN_SIZE (NVGPU_MAX_NUM * NVGPU_MAX_LINKS * \ 64 * KiB) =20 -static inline qemu_irq spapr_phb_lsi_qirq(struct SpaprPhbState *phb, int p= in) -{ - SpaprMachineState *spapr =3D SPAPR_MACHINE(qdev_get_machine()); - - return spapr_qirq(spapr, phb->lsi_table[pin].irq); -} - int spapr_dt_phb(SpaprPhbState *phb, uint32_t intc_phandle, void *fdt, uint32_t nr_msis, int *node_offset); =20 --=20 2.21.0