From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fToo1-0002zT-Hf for qemu-devel@nongnu.org; Fri, 15 Jun 2018 09:30:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTonw-0003Q3-H6 for qemu-devel@nongnu.org; Fri, 15 Jun 2018 09:30:21 -0400 Received: from 9.mo173.mail-out.ovh.net ([46.105.72.44]:46397) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fTonw-0003PM-As for qemu-devel@nongnu.org; Fri, 15 Jun 2018 09:30:16 -0400 Received: from player799.ha.ovh.net (unknown [10.109.122.124]) by mo173.mail-out.ovh.net (Postfix) with ESMTP id B1AB4C5AB8 for ; Fri, 15 Jun 2018 15:30:14 +0200 (CEST) Date: Fri, 15 Jun 2018 15:30:05 +0200 From: Greg Kurz Message-ID: <20180615153005.403d8996@bahia.lan> In-Reply-To: <20180615115303.31125-3-clg@kaod.org> References: <20180615115303.31125-1-clg@kaod.org> <20180615115303.31125-3-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 2/3] spapr: remove unused spapr_irq routines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?Q8OpZHJpYw==?= Le Goater Cc: David Gibson , qemu-ppc@nongnu.org, qemu-devel@nongnu.org On Fri, 15 Jun 2018 13:53:02 +0200 C=C3=A9dric Le Goater wrote: > spapr_irq_alloc_block and spapr_irq_alloc() are now deprecated. >=20 > Signed-off-by: C=C3=A9dric Le Goater > --- Reviewed-by: Greg Kurz > include/hw/ppc/spapr.h | 4 --- > hw/ppc/spapr.c | 80 +-------------------------------------------= ------ > 2 files changed, 1 insertion(+), 83 deletions(-) >=20 > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 6088f44c1b2a..49cda04b1493 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -772,10 +772,6 @@ int spapr_get_vcpu_id(PowerPCCPU *cpu); > void spapr_set_vcpu_id(PowerPCCPU *cpu, int cpu_index, Error **errp); > PowerPCCPU *spapr_find_cpu(int vcpu_id); > =20 > -int spapr_irq_alloc(sPAPRMachineState *spapr, int irq_hint, bool lsi, > - Error **errp); > -int spapr_irq_alloc_block(sPAPRMachineState *spapr, int num, bool lsi, > - bool align, Error **errp); > int spapr_irq_find(sPAPRMachineState *spapr, int num, bool align, > Error **errp); > #define spapr_irq_findone(spapr, errp) spapr_irq_find(spapr, 1, false, e= rrp) > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index b1d19b328166..c464951747e3 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3840,84 +3840,6 @@ int spapr_irq_find(sPAPRMachineState *spapr, int n= um, bool align, Error **errp) > return first + ics->offset; > } > =20 > -/* > - * Allocate the IRQ number and set the IRQ type, LSI or MSI > - */ > -static void spapr_irq_set_lsi(sPAPRMachineState *spapr, int irq, bool ls= i) > -{ > - ics_set_irq_type(spapr->ics, irq - spapr->ics->offset, lsi); > -} > - > -int spapr_irq_alloc(sPAPRMachineState *spapr, int irq_hint, bool lsi, > - Error **errp) > -{ > - ICSState *ics =3D spapr->ics; > - int irq; > - > - assert(ics); > - > - if (irq_hint) { > - if (!ICS_IRQ_FREE(ics, irq_hint - ics->offset)) { > - error_setg(errp, "can't allocate IRQ %d: already in use", ir= q_hint); > - return -1; > - } > - irq =3D irq_hint; > - } else { > - irq =3D ics_find_free_block(ics, 1, 1); > - if (irq < 0) { > - error_setg(errp, "can't allocate IRQ: no IRQ left"); > - return -1; > - } > - irq +=3D ics->offset; > - } > - > - spapr_irq_set_lsi(spapr, irq, lsi); > - trace_spapr_irq_alloc(irq); > - > - return irq; > -} > - > -/* > - * Allocate block of consecutive IRQs, and return the number of the firs= t IRQ in > - * the block. If align=3D=3Dtrue, aligns the first IRQ number to num. > - */ > -int spapr_irq_alloc_block(sPAPRMachineState *spapr, int num, bool lsi, > - bool align, Error **errp) > -{ > - ICSState *ics =3D spapr->ics; > - int i, first =3D -1; > - > - assert(ics); > - > - /* > - * MSIMesage::data is used for storing VIRQ so > - * it has to be aligned to num to support multiple > - * MSI vectors. MSI-X is not affected by this. > - * The hint is used for the first IRQ, the rest should > - * be allocated continuously. > - */ > - if (align) { > - assert((num =3D=3D 1) || (num =3D=3D 2) || (num =3D=3D 4) || > - (num =3D=3D 8) || (num =3D=3D 16) || (num =3D=3D 32)); > - first =3D ics_find_free_block(ics, num, num); > - } else { > - first =3D ics_find_free_block(ics, num, 1); > - } > - if (first < 0) { > - error_setg(errp, "can't find a free %d-IRQ block", num); > - return -1; > - } > - > - first +=3D ics->offset; > - for (i =3D first; i < first + num; ++i) { > - spapr_irq_set_lsi(spapr, i, lsi); > - } > - > - trace_spapr_irq_alloc_block(first, num, lsi, align); > - > - return first; > -} > - > int spapr_irq_claim(sPAPRMachineState *spapr, int irq, int num, bool lsi, > Error **errp) > { > @@ -3934,7 +3856,7 @@ int spapr_irq_claim(sPAPRMachineState *spapr, int i= rq, int num, bool lsi, > =20 > for (i =3D srcno; i < srcno + num; ++i) { > if (ICS_IRQ_FREE(ics, i)) { > - spapr_irq_set_lsi(spapr, i + ics->offset, lsi); > + ics_set_irq_type(ics, i, lsi); > } else { > error_setg(errp, "IRQ %d is not free", i + ics->offset); > ret =3D -1;