| Message ID | 1466704050-15108-2-git-send-email-nikunj@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jun 23, 2016 at 11:17:20PM +0530, Nikunj A Dadhania wrote: > From: Benjamin Herrenschmidt <benh@kernel.crashing.org> > > The common class doesn't change, the KVM one is sPAPR specific. Rename > variables and functions to xics_spapr. > > Retain the type name as "xics" to preserve migration for existing sPAPR > guests. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> > --- > hw/intc/xics.c | 29 +++++++++++++++-------------- > hw/intc/xics_kvm.c | 6 +++--- > hw/ppc/spapr.c | 7 ++++--- > hw/ppc/spapr_events.c | 2 +- > hw/ppc/spapr_pci.c | 10 +++++----- > hw/ppc/spapr_vio.c | 2 +- > include/hw/ppc/xics.h | 29 +++++++++++++++++------------ > 7 files changed, 46 insertions(+), 39 deletions(-) > > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index cce7f3d..a715532 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -729,7 +729,8 @@ static int ics_find_free_block(ICSState *ics, int num, int alignnum) > return -1; > } > > -int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp) > +int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi, > + Error **errp) > { > ICSState *ics = &icp->ics[src]; > int irq; > @@ -760,8 +761,8 @@ int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp) > * Allocate block of consecutive IRQs, and return the number of the first IRQ in the block. > * If align==true, aligns the first IRQ number to num. > */ > -int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align, > - Error **errp) > +int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, > + bool align, Error **errp) > { > int i, first = -1; > ICSState *ics = &icp->ics[src]; > @@ -810,7 +811,7 @@ static void ics_free(ICSState *ics, int srcno, int num) > } > } > > -void xics_free(XICSState *icp, int irq, int num) > +void xics_spapr_free(XICSState *icp, int irq, int num) > { > int src = xics_find_source(icp, irq); > > @@ -1029,7 +1030,7 @@ static void xics_set_nr_servers(XICSState *icp, uint32_t nr_servers, > } > } > > -static void xics_realize(DeviceState *dev, Error **errp) > +static void xics_spapr_realize(DeviceState *dev, Error **errp) > { > XICSState *icp = XICS(dev); > Error *error = NULL; > @@ -1068,7 +1069,7 @@ static void xics_realize(DeviceState *dev, Error **errp) > } > } > > -static void xics_initfn(Object *obj) > +static void xics_spapr_initfn(Object *obj) > { > XICSState *xics = XICS(obj); > > @@ -1077,29 +1078,29 @@ static void xics_initfn(Object *obj) > xics->ics->icp = xics; > } > > -static void xics_class_init(ObjectClass *oc, void *data) > +static void xics_spapr_class_init(ObjectClass *oc, void *data) > { > DeviceClass *dc = DEVICE_CLASS(oc); > - XICSStateClass *xsc = XICS_CLASS(oc); > + XICSStateClass *xsc = XICS_SPAPR_CLASS(oc); > > - dc->realize = xics_realize; > + dc->realize = xics_spapr_realize; > xsc->set_nr_irqs = xics_set_nr_irqs; > xsc->set_nr_servers = xics_set_nr_servers; > } > > -static const TypeInfo xics_info = { > - .name = TYPE_XICS, > +static const TypeInfo xics_spapr_info = { > + .name = TYPE_XICS_SPAPR, > .parent = TYPE_XICS_COMMON, > .instance_size = sizeof(XICSState), > .class_size = sizeof(XICSStateClass), > - .class_init = xics_class_init, > - .instance_init = xics_initfn, > + .class_init = xics_spapr_class_init, > + .instance_init = xics_spapr_initfn, > }; > > static void xics_register_types(void) > { > type_register_static(&xics_common_info); > - type_register_static(&xics_info); > + type_register_static(&xics_spapr_info); > type_register_static(&ics_info); > type_register_static(&icp_info); > } > diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c > index b17d6a9..90d657e 100644 > --- a/hw/intc/xics_kvm.c > +++ b/hw/intc/xics_kvm.c > @@ -495,8 +495,8 @@ static void xics_kvm_class_init(ObjectClass *oc, void *data) > xsc->set_nr_servers = xics_kvm_set_nr_servers; > } > > -static const TypeInfo xics_kvm_info = { > - .name = TYPE_KVM_XICS, > +static const TypeInfo xics_spapr_kvm_info = { > + .name = TYPE_XICS_SPAPR_KVM, > .parent = TYPE_XICS_COMMON, > .instance_size = sizeof(KVMXICSState), > .class_init = xics_kvm_class_init, > @@ -505,7 +505,7 @@ static const TypeInfo xics_kvm_info = { > > static void xics_kvm_register_types(void) > { > - type_register_static(&xics_kvm_info); > + type_register_static(&xics_spapr_kvm_info); > type_register_static(&ics_kvm_info); > type_register_static(&icp_kvm_info); > } > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0b6bb9c..a8d497c 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -122,7 +122,8 @@ static XICSState *xics_system_init(MachineState *machine, > Error *err = NULL; > > if (machine_kernel_irqchip_allowed(machine)) { > - icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, &err); > + icp = try_create_xics(TYPE_XICS_SPAPR_KVM, nr_servers, nr_irqs, > + &err); > } > if (machine_kernel_irqchip_required(machine) && !icp) { > error_reportf_err(err, > @@ -133,7 +134,7 @@ static XICSState *xics_system_init(MachineState *machine, > } > > if (!icp) { > - icp = try_create_xics(TYPE_XICS, nr_servers, nr_irqs, errp); > + icp = try_create_xics(TYPE_XICS_SPAPR, nr_servers, nr_irqs, errp); > } > > return icp; > @@ -1781,7 +1782,7 @@ static void ppc_spapr_init(MachineState *machine) > /* Set up Interrupt Controller before we create the VCPUs */ > spapr->icp = xics_system_init(machine, > DIV_ROUND_UP(max_cpus * smt, smp_threads), > - XICS_IRQS, &error_fatal); > + XICS_IRQS_SPAPR, &error_fatal); > > if (smc->dr_lmb_enabled) { > spapr_validate_node_memory(machine, &error_fatal); > diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c > index af80992..0585f8a 100644 > --- a/hw/ppc/spapr_events.c > +++ b/hw/ppc/spapr_events.c > @@ -603,7 +603,7 @@ out_no_events: > void spapr_events_init(sPAPRMachineState *spapr) > { > QTAILQ_INIT(&spapr->pending_events); > - spapr->check_exception_irq = xics_alloc(spapr->icp, 0, 0, false, > + spapr->check_exception_irq = xics_spapr_alloc(spapr->icp, 0, 0, false, > &error_fatal); > spapr->epow_notifier.notify = spapr_powerdown_req; > qemu_register_powerdown_notifier(&spapr->epow_notifier); > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 9f28fb3..451651d 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -322,7 +322,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr, > return; > } > > - xics_free(spapr->icp, msi->first_irq, msi->num); > + xics_spapr_free(spapr->icp, msi->first_irq, msi->num); > if (msi_present(pdev)) { > spapr_msi_setmsg(pdev, 0, false, 0, 0); > } > @@ -360,7 +360,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr, > } > > /* Allocate MSIs */ > - irq = xics_alloc_block(spapr->icp, 0, req_num, false, > + irq = xics_spapr_alloc_block(spapr->icp, 0, req_num, false, > ret_intr_type == RTAS_TYPE_MSI, &err); > if (err) { > error_reportf_err(err, "Can't allocate MSIs for device %x: ", > @@ -371,7 +371,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr, > > /* Release previous MSIs */ > if (msi) { > - xics_free(spapr->icp, msi->first_irq, msi->num); > + xics_spapr_free(spapr->icp, msi->first_irq, msi->num); > g_hash_table_remove(phb->msi, &config_addr); > } > > @@ -1442,7 +1442,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) > uint32_t irq; > Error *local_err = NULL; > > - irq = xics_alloc_block(spapr->icp, 0, 1, true, false, &local_err); > + irq = xics_spapr_alloc_block(spapr->icp, 0, 1, true, false, &local_err); > if (local_err) { > error_propagate(errp, local_err); > error_prepend(errp, "can't allocate LSIs: "); > @@ -1801,7 +1801,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, > _FDT(fdt_setprop(fdt, bus_off, "ranges", &ranges, sizeof_ranges)); > _FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg))); > _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1)); > - _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", XICS_IRQS)); > + _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", XICS_IRQS_SPAPR)); > > /* Build the interrupt-map, this must matches what is done > * in pci_spapr_map_irq > diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c > index ae40db8..7ffd23e 100644 > --- a/hw/ppc/spapr_vio.c > +++ b/hw/ppc/spapr_vio.c > @@ -463,7 +463,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp) > dev->qdev.id = id; > } > > - dev->irq = xics_alloc(spapr->icp, 0, dev->irq, false, &local_err); > + dev->irq = xics_spapr_alloc(spapr->icp, 0, dev->irq, false, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index 9091054..452a978 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -32,20 +32,24 @@ > #define TYPE_XICS_COMMON "xics-common" > #define XICS_COMMON(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_COMMON) > > -#define TYPE_XICS "xics" > -#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS) > +/* > + * Retain xics as the type name to be compatible for migration. Rest all the > + * functions, class and variables are renamed as xics_spapr. > + */ > +#define TYPE_XICS_SPAPR "xics" > +#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_SPAPR) This should change to XICS_SPAPR to match the TYPE macro. > > -#define TYPE_KVM_XICS "xics-kvm" > -#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_KVM_XICS) > +#define TYPE_XICS_SPAPR_KVM "xics-spapr-kvm" > +#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_XICS_SPAPR_KVM) Likewise XICS_SPAPR_KVM(). > #define XICS_COMMON_CLASS(klass) \ > OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_COMMON) > -#define XICS_CLASS(klass) \ > - OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS) > +#define XICS_SPAPR_CLASS(klass) \ > + OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_SPAPR) > #define XICS_COMMON_GET_CLASS(obj) \ > OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_COMMON) > -#define XICS_GET_CLASS(obj) \ > - OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS) > +#define XICS_SPAPR_GET_CLASS(obj) \ > + OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_SPAPR) > > #define XICS_IPI 0x2 > #define XICS_BUID 0x1 > @@ -157,14 +161,15 @@ struct ICSIRQState { > uint8_t flags; > }; > > -#define XICS_IRQS 1024 > +#define XICS_IRQS_SPAPR 1024 > > qemu_irq xics_get_qirq(XICSState *icp, int irq); > void xics_set_irq_type(XICSState *icp, int irq, bool lsi); > -int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp); > -int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align, > +int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi, > Error **errp); > -void xics_free(XICSState *icp, int irq, int num); > +int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, > + bool align, Error **errp); > +void xics_spapr_free(XICSState *icp, int irq, int num); > > void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); > void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu);
David Gibson <david@gibson.dropbear.id.au> writes: > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h >> index 9091054..452a978 100644 >> --- a/include/hw/ppc/xics.h >> +++ b/include/hw/ppc/xics.h >> @@ -32,20 +32,24 @@ >> #define TYPE_XICS_COMMON "xics-common" >> #define XICS_COMMON(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_COMMON) >> >> -#define TYPE_XICS "xics" >> -#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS) >> +/* >> + * Retain xics as the type name to be compatible for migration. Rest all the >> + * functions, class and variables are renamed as xics_spapr. >> + */ >> +#define TYPE_XICS_SPAPR "xics" >> +#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_SPAPR) > > This should change to XICS_SPAPR to match the TYPE macro. Done. > >> >> -#define TYPE_KVM_XICS "xics-kvm" >> -#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_KVM_XICS) >> +#define TYPE_XICS_SPAPR_KVM "xics-spapr-kvm" >> +#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_XICS_SPAPR_KVM) > > Likewise XICS_SPAPR_KVM(). > Done. Regards Nikunj
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index cce7f3d..a715532 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -729,7 +729,8 @@ static int ics_find_free_block(ICSState *ics, int num, int alignnum) return -1; } -int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp) +int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi, + Error **errp) { ICSState *ics = &icp->ics[src]; int irq; @@ -760,8 +761,8 @@ int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp) * Allocate block of consecutive IRQs, and return the number of the first IRQ in the block. * If align==true, aligns the first IRQ number to num. */ -int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align, - Error **errp) +int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, + bool align, Error **errp) { int i, first = -1; ICSState *ics = &icp->ics[src]; @@ -810,7 +811,7 @@ static void ics_free(ICSState *ics, int srcno, int num) } } -void xics_free(XICSState *icp, int irq, int num) +void xics_spapr_free(XICSState *icp, int irq, int num) { int src = xics_find_source(icp, irq); @@ -1029,7 +1030,7 @@ static void xics_set_nr_servers(XICSState *icp, uint32_t nr_servers, } } -static void xics_realize(DeviceState *dev, Error **errp) +static void xics_spapr_realize(DeviceState *dev, Error **errp) { XICSState *icp = XICS(dev); Error *error = NULL; @@ -1068,7 +1069,7 @@ static void xics_realize(DeviceState *dev, Error **errp) } } -static void xics_initfn(Object *obj) +static void xics_spapr_initfn(Object *obj) { XICSState *xics = XICS(obj); @@ -1077,29 +1078,29 @@ static void xics_initfn(Object *obj) xics->ics->icp = xics; } -static void xics_class_init(ObjectClass *oc, void *data) +static void xics_spapr_class_init(ObjectClass *oc, void *data) { DeviceClass *dc = DEVICE_CLASS(oc); - XICSStateClass *xsc = XICS_CLASS(oc); + XICSStateClass *xsc = XICS_SPAPR_CLASS(oc); - dc->realize = xics_realize; + dc->realize = xics_spapr_realize; xsc->set_nr_irqs = xics_set_nr_irqs; xsc->set_nr_servers = xics_set_nr_servers; } -static const TypeInfo xics_info = { - .name = TYPE_XICS, +static const TypeInfo xics_spapr_info = { + .name = TYPE_XICS_SPAPR, .parent = TYPE_XICS_COMMON, .instance_size = sizeof(XICSState), .class_size = sizeof(XICSStateClass), - .class_init = xics_class_init, - .instance_init = xics_initfn, + .class_init = xics_spapr_class_init, + .instance_init = xics_spapr_initfn, }; static void xics_register_types(void) { type_register_static(&xics_common_info); - type_register_static(&xics_info); + type_register_static(&xics_spapr_info); type_register_static(&ics_info); type_register_static(&icp_info); } diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index b17d6a9..90d657e 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -495,8 +495,8 @@ static void xics_kvm_class_init(ObjectClass *oc, void *data) xsc->set_nr_servers = xics_kvm_set_nr_servers; } -static const TypeInfo xics_kvm_info = { - .name = TYPE_KVM_XICS, +static const TypeInfo xics_spapr_kvm_info = { + .name = TYPE_XICS_SPAPR_KVM, .parent = TYPE_XICS_COMMON, .instance_size = sizeof(KVMXICSState), .class_init = xics_kvm_class_init, @@ -505,7 +505,7 @@ static const TypeInfo xics_kvm_info = { static void xics_kvm_register_types(void) { - type_register_static(&xics_kvm_info); + type_register_static(&xics_spapr_kvm_info); type_register_static(&ics_kvm_info); type_register_static(&icp_kvm_info); } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0b6bb9c..a8d497c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -122,7 +122,8 @@ static XICSState *xics_system_init(MachineState *machine, Error *err = NULL; if (machine_kernel_irqchip_allowed(machine)) { - icp = try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, &err); + icp = try_create_xics(TYPE_XICS_SPAPR_KVM, nr_servers, nr_irqs, + &err); } if (machine_kernel_irqchip_required(machine) && !icp) { error_reportf_err(err, @@ -133,7 +134,7 @@ static XICSState *xics_system_init(MachineState *machine, } if (!icp) { - icp = try_create_xics(TYPE_XICS, nr_servers, nr_irqs, errp); + icp = try_create_xics(TYPE_XICS_SPAPR, nr_servers, nr_irqs, errp); } return icp; @@ -1781,7 +1782,7 @@ static void ppc_spapr_init(MachineState *machine) /* Set up Interrupt Controller before we create the VCPUs */ spapr->icp = xics_system_init(machine, DIV_ROUND_UP(max_cpus * smt, smp_threads), - XICS_IRQS, &error_fatal); + XICS_IRQS_SPAPR, &error_fatal); if (smc->dr_lmb_enabled) { spapr_validate_node_memory(machine, &error_fatal); diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index af80992..0585f8a 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -603,7 +603,7 @@ out_no_events: void spapr_events_init(sPAPRMachineState *spapr) { QTAILQ_INIT(&spapr->pending_events); - spapr->check_exception_irq = xics_alloc(spapr->icp, 0, 0, false, + spapr->check_exception_irq = xics_spapr_alloc(spapr->icp, 0, 0, false, &error_fatal); spapr->epow_notifier.notify = spapr_powerdown_req; qemu_register_powerdown_notifier(&spapr->epow_notifier); diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 9f28fb3..451651d 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -322,7 +322,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr, return; } - xics_free(spapr->icp, msi->first_irq, msi->num); + xics_spapr_free(spapr->icp, msi->first_irq, msi->num); if (msi_present(pdev)) { spapr_msi_setmsg(pdev, 0, false, 0, 0); } @@ -360,7 +360,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr, } /* Allocate MSIs */ - irq = xics_alloc_block(spapr->icp, 0, req_num, false, + irq = xics_spapr_alloc_block(spapr->icp, 0, req_num, false, ret_intr_type == RTAS_TYPE_MSI, &err); if (err) { error_reportf_err(err, "Can't allocate MSIs for device %x: ", @@ -371,7 +371,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAPRMachineState *spapr, /* Release previous MSIs */ if (msi) { - xics_free(spapr->icp, msi->first_irq, msi->num); + xics_spapr_free(spapr->icp, msi->first_irq, msi->num); g_hash_table_remove(phb->msi, &config_addr); } @@ -1442,7 +1442,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) uint32_t irq; Error *local_err = NULL; - irq = xics_alloc_block(spapr->icp, 0, 1, true, false, &local_err); + irq = xics_spapr_alloc_block(spapr->icp, 0, 1, true, false, &local_err); if (local_err) { error_propagate(errp, local_err); error_prepend(errp, "can't allocate LSIs: "); @@ -1801,7 +1801,7 @@ int spapr_populate_pci_dt(sPAPRPHBState *phb, _FDT(fdt_setprop(fdt, bus_off, "ranges", &ranges, sizeof_ranges)); _FDT(fdt_setprop(fdt, bus_off, "reg", &bus_reg, sizeof(bus_reg))); _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pci-config-space-type", 0x1)); - _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", XICS_IRQS)); + _FDT(fdt_setprop_cell(fdt, bus_off, "ibm,pe-total-#msi", XICS_IRQS_SPAPR)); /* Build the interrupt-map, this must matches what is done * in pci_spapr_map_irq diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index ae40db8..7ffd23e 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -463,7 +463,7 @@ static void spapr_vio_busdev_realize(DeviceState *qdev, Error **errp) dev->qdev.id = id; } - dev->irq = xics_alloc(spapr->icp, 0, dev->irq, false, &local_err); + dev->irq = xics_spapr_alloc(spapr->icp, 0, dev->irq, false, &local_err); if (local_err) { error_propagate(errp, local_err); return; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 9091054..452a978 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -32,20 +32,24 @@ #define TYPE_XICS_COMMON "xics-common" #define XICS_COMMON(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_COMMON) -#define TYPE_XICS "xics" -#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS) +/* + * Retain xics as the type name to be compatible for migration. Rest all the + * functions, class and variables are renamed as xics_spapr. + */ +#define TYPE_XICS_SPAPR "xics" +#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_SPAPR) -#define TYPE_KVM_XICS "xics-kvm" -#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_KVM_XICS) +#define TYPE_XICS_SPAPR_KVM "xics-spapr-kvm" +#define KVM_XICS(obj) OBJECT_CHECK(KVMXICSState, (obj), TYPE_XICS_SPAPR_KVM) #define XICS_COMMON_CLASS(klass) \ OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_COMMON) -#define XICS_CLASS(klass) \ - OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS) +#define XICS_SPAPR_CLASS(klass) \ + OBJECT_CLASS_CHECK(XICSStateClass, (klass), TYPE_XICS_SPAPR) #define XICS_COMMON_GET_CLASS(obj) \ OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_COMMON) -#define XICS_GET_CLASS(obj) \ - OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS) +#define XICS_SPAPR_GET_CLASS(obj) \ + OBJECT_GET_CLASS(XICSStateClass, (obj), TYPE_XICS_SPAPR) #define XICS_IPI 0x2 #define XICS_BUID 0x1 @@ -157,14 +161,15 @@ struct ICSIRQState { uint8_t flags; }; -#define XICS_IRQS 1024 +#define XICS_IRQS_SPAPR 1024 qemu_irq xics_get_qirq(XICSState *icp, int irq); void xics_set_irq_type(XICSState *icp, int irq, bool lsi); -int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp); -int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align, +int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi, Error **errp); -void xics_free(XICSState *icp, int irq, int num); +int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, + bool align, Error **errp); +void xics_spapr_free(XICSState *icp, int irq, int num); void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu);