On Wed, 25 Sep 2019 16:45:29 +1000
David Gibson <da...@gibson.dropbear.id.au> wrote:
> spapr_irq_free() can be used to free multiple irqs at once. That's useful
> for its callers, but there's no need to make the individual backend hooks
> handle this. We can loop across the irqs in spapr_irq_free() itself and
> have the hooks just do one at time.
>
> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
Reviewed-by: Greg Kurz <gr...@kaod.org>
> hw/ppc/spapr_irq.c | 27 ++++++++++++---------------
> include/hw/ppc/spapr_irq.h | 2 +-
> 2 files changed, 13 insertions(+), 16 deletions(-)
>
> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
> index db6755f3ab..c40357a985 100644
> --- a/hw/ppc/spapr_irq.c
> +++ b/hw/ppc/spapr_irq.c
> @@ -133,16 +133,13 @@ static int spapr_irq_claim_xics(SpaprMachineState
> *spapr, int irq, bool lsi,
> return 0;
> }
>
> -static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq)
> {
> ICSState *ics = spapr->ics;
> uint32_t srcno = irq - ics->offset;
> - int i;
>
> if (ics_valid_irq(ics, irq)) {
> - for (i = srcno; i < srcno + num; ++i) {
> - memset(&ics->irqs[i], 0, sizeof(ICSIRQState));
> - }
> + memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState));
> }
> }
>
> @@ -269,13 +266,9 @@ static int spapr_irq_claim_xive(SpaprMachineState
> *spapr, int irq, bool lsi,
> return 0;
> }
>
> -static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_xive(SpaprMachineState *spapr, int irq)
> {
> - int i;
> -
> - for (i = irq; i < irq + num; ++i) {
> - spapr_xive_irq_free(spapr->xive, i);
> - }
> + spapr_xive_irq_free(spapr->xive, irq);
> }
>
> static void spapr_irq_print_info_xive(SpaprMachineState *spapr,
> @@ -438,10 +431,10 @@ static int spapr_irq_claim_dual(SpaprMachineState
> *spapr, int irq, bool lsi,
> return ret;
> }
>
> -static void spapr_irq_free_dual(SpaprMachineState *spapr, int irq, int num)
> +static void spapr_irq_free_dual(SpaprMachineState *spapr, int irq)
> {
> - spapr_irq_xics.free(spapr, irq, num);
> - spapr_irq_xive.free(spapr, irq, num);
> + spapr_irq_xics.free(spapr, irq);
> + spapr_irq_xive.free(spapr, irq);
> }
>
> static void spapr_irq_print_info_dual(SpaprMachineState *spapr, Monitor *mon)
> @@ -640,7 +633,11 @@ int spapr_irq_claim(SpaprMachineState *spapr, int irq,
> bool lsi, Error **errp)
>
> void spapr_irq_free(SpaprMachineState *spapr, int irq, int num)
> {
> - spapr->irq->free(spapr, irq, num);
> + int i;
> +
> + for (i = irq; i < (irq + num); i++) {
> + spapr->irq->free(spapr, irq);
> + }
> }
>
> qemu_irq spapr_qirq(SpaprMachineState *spapr, int irq)
> diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h
> index 9b60378e28..ed88b4599a 100644
> --- a/include/hw/ppc/spapr_irq.h
> +++ b/include/hw/ppc/spapr_irq.h
> @@ -43,7 +43,7 @@ typedef struct SpaprIrq {
>
> void (*init)(SpaprMachineState *spapr, Error **errp);
> int (*claim)(SpaprMachineState *spapr, int irq, bool lsi, Error **errp);
> - void (*free)(SpaprMachineState *spapr, int irq, int num);
> + void (*free)(SpaprMachineState *spapr, int irq);
> void (*print_info)(SpaprMachineState *spapr, Monitor *mon);
> void (*dt_populate)(SpaprMachineState *spapr, uint32_t nr_servers,
> void *fdt, uint32_t phandle);
