This argument isn't used by the backends anymore. Signed-off-by: Greg Kurz <gr...@kaod.org> --- include/hw/ppc/spapr_irq.h | 6 ++---- hw/intc/spapr_xive.c | 4 ++-- hw/intc/xics_spapr.c | 4 ++-- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_irq.c | 5 ++--- 5 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/include/hw/ppc/spapr_irq.h b/include/hw/ppc/spapr_irq.h index 3e1c619d4c06..e2519e4bc596 100644 --- a/include/hw/ppc/spapr_irq.h +++ b/include/hw/ppc/spapr_irq.h @@ -61,8 +61,7 @@ struct SpaprInterruptControllerClass { /* These methods should only be called on the active intc */ void (*set_irq)(SpaprInterruptController *intc, int irq, int val); void (*print_info)(SpaprInterruptController *intc, Monitor *mon); - void (*dt)(SpaprInterruptController *intc, uint32_t nr_servers, - void *fdt, uint32_t phandle); + void (*dt)(SpaprInterruptController *intc, void *fdt, uint32_t phandle); int (*post_load)(SpaprInterruptController *intc, int version_id); }; @@ -73,8 +72,7 @@ int spapr_irq_cpu_intc_create(struct SpaprMachineState *spapr, void spapr_irq_cpu_intc_reset(struct SpaprMachineState *spapr, PowerPCCPU *cpu); void spapr_irq_cpu_intc_destroy(struct SpaprMachineState *spapr, PowerPCCPU *cpu); void spapr_irq_print_info(struct SpaprMachineState *spapr, Monitor *mon); -void spapr_irq_dt(struct SpaprMachineState *spapr, uint32_t nr_servers, - void *fdt, uint32_t phandle); +void spapr_irq_dt(struct SpaprMachineState *spapr, void *fdt, uint32_t phandle); uint32_t spapr_irq_nr_msis(struct SpaprMachineState *spapr); int spapr_irq_msi_alloc(struct SpaprMachineState *spapr, uint32_t num, bool align, diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index 8331026fdb12..749cff9bf2b9 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -691,8 +691,8 @@ static void spapr_xive_print_info(SpaprInterruptController *intc, Monitor *mon) spapr_xive_pic_print_info(xive, mon); } -static void spapr_xive_dt(SpaprInterruptController *intc, uint32_t nr_servers, - void *fdt, uint32_t phandle) +static void spapr_xive_dt(SpaprInterruptController *intc, void *fdt, + uint32_t phandle) { SpaprXive *xive = SPAPR_XIVE(intc); int node; diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c index 8810bd93c856..a790b59f1bbc 100644 --- a/hw/intc/xics_spapr.c +++ b/hw/intc/xics_spapr.c @@ -312,8 +312,8 @@ static void ics_spapr_realize(DeviceState *dev, Error **errp) spapr_register_hypercall(H_IPOLL, h_ipoll); } -static void xics_spapr_dt(SpaprInterruptController *intc, uint32_t nr_servers, - void *fdt, uint32_t phandle) +static void xics_spapr_dt(SpaprInterruptController *intc, void *fdt, + uint32_t phandle) { uint32_t interrupt_server_ranges_prop[] = { 0, cpu_to_be32(ICS_SPAPR(intc)->nr_servers), diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 21de0456446b..595dd1b81ce1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1164,7 +1164,7 @@ void *spapr_build_fdt(SpaprMachineState *spapr, bool reset, size_t space) _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); /* /interrupt controller */ - spapr_irq_dt(spapr, spapr_max_server_number(spapr), fdt, PHANDLE_INTC); + spapr_irq_dt(spapr, fdt, PHANDLE_INTC); ret = spapr_dt_memory(spapr, fdt); if (ret < 0) { diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index f2897fbc942a..f93476d00a59 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -271,13 +271,12 @@ void spapr_irq_print_info(SpaprMachineState *spapr, Monitor *mon) sicc->print_info(spapr->active_intc, mon); } -void spapr_irq_dt(SpaprMachineState *spapr, uint32_t nr_servers, - void *fdt, uint32_t phandle) +void spapr_irq_dt(SpaprMachineState *spapr, void *fdt, uint32_t phandle) { SpaprInterruptControllerClass *sicc = SPAPR_INTC_GET_CLASS(spapr->active_intc); - sicc->dt(spapr->active_intc, nr_servers, fdt, phandle); + sicc->dt(spapr->active_intc, fdt, phandle); } uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr) -- 2.26.2