From nobody Wed Nov 5 07:34:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533888225967289.67495619197393; Fri, 10 Aug 2018 01:03:45 -0700 (PDT) Received: from localhost ([::1]:54855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo2Oa-0005tG-Ta for importer@patchew.org; Fri, 10 Aug 2018 04:03:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo2Lx-0004hN-CT for qemu-devel@nongnu.org; Fri, 10 Aug 2018 04:00:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fo2Lt-0007at-G9 for qemu-devel@nongnu.org; Fri, 10 Aug 2018 04:00:57 -0400 Received: from 11.mo7.mail-out.ovh.net ([87.98.173.157]:57481) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fo2Lt-0007Zl-84 for qemu-devel@nongnu.org; Fri, 10 Aug 2018 04:00:53 -0400 Received: from player728.ha.ovh.net (unknown [10.109.159.222]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id F1C7BC3ED2 for ; Fri, 10 Aug 2018 10:00:50 +0200 (CEST) Received: from zorba.kaod.org (ARennes-657-1-63-215.w90-32.abo.wanadoo.fr [90.32.250.215]) (Authenticated sender: clg@kaod.org) by player728.ha.ovh.net (Postfix) with ESMTPSA id 594E35400C1; Fri, 10 Aug 2018 10:00:43 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: David Gibson Date: Fri, 10 Aug 2018 10:00:26 +0200 Message-Id: <20180810080026.19398-1-clg@kaod.org> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Ovh-Tracer-Id: 5058105335392603110 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtjedrtdehgdduvdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm 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: 87.98.173.157 Subject: [Qemu-devel] [PATCH] spapr_pci: factorize the use of SPAPR_MACHINE_GET_CLASS() 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: , Cc: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It should save us some CPU cycles as these routines perform a lot of checks. Signed-off-by: C=C3=A9dric Le Goater --- hw/ppc/spapr_pci.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 3791ced6c536..5cd676e4430d 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -267,6 +267,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, target_ulong args, uint32_t nret, target_ulong rets) { + sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); uint32_t config_addr =3D rtas_ld(args, 0); uint64_t buid =3D rtas_ldq(args, 1); unsigned int func =3D rtas_ld(args, 3); @@ -334,7 +335,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, return; } =20 - if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { + if (!smc->legacy_irq_allocation) { spapr_irq_msi_free(spapr, msi->first_irq, msi->num); } spapr_irq_free(spapr, msi->first_irq, msi->num); @@ -375,7 +376,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, } =20 /* Allocate MSIs */ - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { + if (smc->legacy_irq_allocation) { irq =3D spapr_irq_find(spapr, req_num, ret_intr_type =3D=3D RTAS_T= YPE_MSI, &err); } else { @@ -401,7 +402,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRM= achineState *spapr, =20 /* Release previous MSIs */ if (msi) { - if (!SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { + if (!smc->legacy_irq_allocation) { spapr_irq_msi_free(spapr, msi->first_irq, msi->num); } spapr_irq_free(spapr, msi->first_irq, msi->num); @@ -1558,6 +1559,7 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) sPAPRMachineState *spapr =3D (sPAPRMachineState *) object_dynamic_cast(qdev_get_machine(), TYPE_SPAPR_MACHINE); + sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); SysBusDevice *s =3D SYS_BUS_DEVICE(dev); sPAPRPHBState *sphb =3D SPAPR_PCI_HOST_BRIDGE(s); PCIHostState *phb =3D PCI_HOST_BRIDGE(s); @@ -1575,7 +1577,6 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) } =20 if (sphb->index !=3D (uint32_t)-1) { - sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); Error *local_err =3D NULL; =20 smc->phb_placement(spapr, sphb->index, @@ -1720,7 +1721,7 @@ static void spapr_phb_realize(DeviceState *dev, Error= **errp) uint32_t irq =3D SPAPR_IRQ_PCI_LSI + sphb->index * PCI_NUM_PINS + = i; Error *local_err =3D NULL; =20 - if (SPAPR_MACHINE_GET_CLASS(spapr)->legacy_irq_allocation) { + if (smc->legacy_irq_allocation) { irq =3D spapr_irq_findone(spapr, &local_err); if (local_err) { error_propagate(errp, local_err); --=20 2.17.1