From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNbq6-0007Q1-Bx for qemu-devel@nongnu.org; Fri, 16 Nov 2018 05:59:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNbq2-0007zr-Ai for qemu-devel@nongnu.org; Fri, 16 Nov 2018 05:59:06 -0500 Received: from 14.mo3.mail-out.ovh.net ([188.165.43.98]:57294) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gNbq2-0007xa-2A for qemu-devel@nongnu.org; Fri, 16 Nov 2018 05:59:02 -0500 Received: from player734.ha.ovh.net (unknown [10.109.143.145]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 9C6321E7F42 for ; Fri, 16 Nov 2018 11:58:59 +0100 (CET) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Fri, 16 Nov 2018 11:57:07 +0100 Message-Id: <20181116105729.23240-15-clg@kaod.org> In-Reply-To: <20181116105729.23240-1-clg@kaod.org> References: <20181116105729.23240-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 14/36] spapr: modify the irq backend 'init' method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Benjamin Herrenschmidt , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Add a 'nr_irqs' parameter to the 'init' method to remove the use of the machine class. Signed-off-by: C=C3=A9dric Le Goater --- include/hw/ppc/spapr_irq.h | 2 +- hw/ppc/spapr_irq.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index bd7301e6d9c6..0e9229bf219e 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -33,7 +33,7 @@ typedef struct sPAPRIrq { uint32_t nr_irqs; uint32_t nr_msis; =20 - void (*init)(sPAPRMachineState *spapr, Error **errp); + void (*init)(sPAPRMachineState *spapr, int nr_irqs, Error **errp); int (*claim)(sPAPRMachineState *spapr, int irq, bool lsi, Error **er= rp); void (*free)(sPAPRMachineState *spapr, int irq, int num); qemu_irq (*qirq)(sPAPRMachineState *spapr, int irq); diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index f8b651de0ec9..bac450ffff23 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -90,11 +90,10 @@ error: return NULL; } =20 -static void spapr_irq_init_xics(sPAPRMachineState *spapr, Error **errp) +static void spapr_irq_init_xics(sPAPRMachineState *spapr, int nr_irqs, + Error **errp) { MachineState *machine =3D MACHINE(spapr); - sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(spapr); - int nr_irqs =3D smc->irq->nr_irqs; Error *local_err =3D NULL; =20 if (kvm_enabled()) { @@ -217,7 +216,7 @@ void spapr_irq_init(sPAPRMachineState *spapr, Error *= *errp) spapr_irq_msi_init(spapr, smc->irq->nr_msis); } =20 - smc->irq->init(spapr, errp); + smc->irq->init(spapr, smc->irq->nr_irqs, errp); } =20 int spapr_irq_claim(sPAPRMachineState *spapr, int irq, bool lsi, Error *= *errp) --=20 2.17.2