From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a16fG-0004Ax-S6 for qemu-devel@nongnu.org; Tue, 24 Nov 2015 01:01:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a16fE-0001K3-Pi for qemu-devel@nongnu.org; Tue, 24 Nov 2015 01:01:18 -0500 Date: Tue, 24 Nov 2015 14:25:09 +1100 From: David Gibson Message-ID: <20151124032509.GH26118@voom.fritz.box> References: <1447201710-10229-1-git-send-email-benh@kernel.crashing.org> <1447201710-10229-29-git-send-email-benh@kernel.crashing.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="/Gk0KcsbyUMelFU1" Content-Disposition: inline In-Reply-To: <1447201710-10229-29-git-send-email-benh@kernel.crashing.org> Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH 28/77] ppc/xics: Rename existing XICS classe to XICS_SPAPR List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Benjamin Herrenschmidt Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org --/Gk0KcsbyUMelFU1 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 11, 2015 at 11:27:41AM +1100, Benjamin Herrenschmidt wrote: > The common class doesn't change, the KVM one is SPAPR specific, this > is a preliminary change to make it easier to support "native" XICS. >=20 > Signed-off-by: Benjamin Herrenschmidt So changing the variable names is fine, but I believe actually changing the type name from "xics" to "xics-spapr" will break migration for existing sPAPR guests. There are some ways to wangle that, but I think it's going to be much simpler to leave the existing name as "xics" and add a new "xics-native". You can still change the name of the TYPE_XICS macro to TYPE_XICS_SPAPR if you want. > --- > hw/intc/xics.c | 26 +++++++++++++------------- > hw/intc/xics_kvm.c | 6 +++--- > hw/ppc/spapr.c | 6 +++--- > hw/ppc/spapr_events.c | 2 +- > hw/ppc/spapr_pci.c | 8 ++++---- > hw/ppc/spapr_vio.c | 2 +- > include/hw/ppc/xics.h | 25 +++++++++++++------------ > 7 files changed, 38 insertions(+), 37 deletions(-) >=20 > diff --git a/hw/intc/xics.c b/hw/intc/xics.c > index 9ff5796..bcea1f0 100644 > --- a/hw/intc/xics.c > +++ b/hw/intc/xics.c > @@ -711,7 +711,7 @@ static int ics_find_free_block(ICSState *ics, int num= , int alignnum) > return -1; > } > =20 > -int xics_alloc(XICSState *icp, int src, int irq_hint, bool lsi) > +int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi) > { > ICSState *ics =3D &icp->ics[src]; > int irq; > @@ -742,7 +742,7 @@ int xics_alloc(XICSState *icp, int src, int irq_hint,= bool lsi) > * 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 xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool al= ign) > +int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, b= ool align) > { > int i, first =3D -1; > ICSState *ics =3D &icp->ics[src]; > @@ -787,7 +787,7 @@ static void ics_free(ICSState *ics, int srcno, int nu= m) > } > } > =20 > -void xics_free(XICSState *icp, int irq, int num) > +void xics_spapr_free(XICSState *icp, int irq, int num) > { > int src =3D xics_find_source(icp, irq); > =20 > @@ -1006,7 +1006,7 @@ static void xics_set_nr_servers(XICSState *icp, uin= t32_t nr_servers, > } > } > =20 > -static void xics_realize(DeviceState *dev, Error **errp) > +static void xics_spapr_realize(DeviceState *dev, Error **errp) > { > XICSState *icp =3D XICS(dev); > Error *error =3D NULL; > @@ -1045,7 +1045,7 @@ static void xics_realize(DeviceState *dev, Error **= errp) > } > } > =20 > -static void xics_initfn(Object *obj) > +static void xics_spapr_initfn(Object *obj) > { > XICSState *xics =3D XICS(obj); > =20 > @@ -1054,29 +1054,29 @@ static void xics_initfn(Object *obj) > xics->ics->icp =3D xics; > } > =20 > -static void xics_class_init(ObjectClass *oc, void *data) > +static void xics_spapr_class_init(ObjectClass *oc, void *data) > { > DeviceClass *dc =3D DEVICE_CLASS(oc); > - XICSStateClass *xsc =3D XICS_CLASS(oc); > + XICSStateClass *xsc =3D XICS_SPAPR_CLASS(oc); > =20 > - dc->realize =3D xics_realize; > + dc->realize =3D xics_spapr_realize; > xsc->set_nr_irqs =3D xics_set_nr_irqs; > xsc->set_nr_servers =3D xics_set_nr_servers; > } > =20 > -static const TypeInfo xics_info =3D { > - .name =3D TYPE_XICS, > +static const TypeInfo xics_spapr_info =3D { > + .name =3D TYPE_XICS_SPAPR, > .parent =3D TYPE_XICS_COMMON, > .instance_size =3D sizeof(XICSState), > .class_size =3D sizeof(XICSStateClass), > - .class_init =3D xics_class_init, > - .instance_init =3D xics_initfn, > + .class_init =3D xics_spapr_class_init, > + .instance_init =3D xics_spapr_initfn, > }; > =20 > 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 d58729c..03ae801 100644 > --- a/hw/intc/xics_kvm.c > +++ b/hw/intc/xics_kvm.c > @@ -490,8 +490,8 @@ static void xics_kvm_class_init(ObjectClass *oc, void= *data) > xsc->set_nr_servers =3D xics_kvm_set_nr_servers; > } > =20 > -static const TypeInfo xics_kvm_info =3D { > - .name =3D TYPE_KVM_XICS, > +static const TypeInfo xics_spapr_kvm_info =3D { > + .name =3D TYPE_XICS_SPAPR_KVM, > .parent =3D TYPE_XICS_COMMON, > .instance_size =3D sizeof(KVMXICSState), > .class_init =3D xics_kvm_class_init, > @@ -500,7 +500,7 @@ static const TypeInfo xics_kvm_info =3D { > =20 > 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 610629e..bf94426 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -119,7 +119,7 @@ static XICSState *xics_system_init(MachineState *mach= ine, > Error *err =3D NULL; > =20 > if (machine_kernel_irqchip_allowed(machine)) { > - icp =3D try_create_xics(TYPE_KVM_XICS, nr_servers, nr_irqs, = &err); > + icp =3D try_create_xics(TYPE_XICS_SPAPR_KVM, nr_servers, nr_= irqs, &err); > } > if (machine_kernel_irqchip_required(machine) && !icp) { > error_report("kernel_irqchip requested but unavailable: %s", > @@ -128,7 +128,7 @@ static XICSState *xics_system_init(MachineState *mach= ine, > } > =20 > if (!icp) { > - icp =3D try_create_xics(TYPE_XICS, nr_servers, nr_irqs, &error_a= bort); > + icp =3D try_create_xics(TYPE_XICS_SPAPR, nr_servers, nr_irqs, &e= rror_abort); > } > =20 > return icp; > @@ -1768,7 +1768,7 @@ static void ppc_spapr_init(MachineState *machine) > spapr->icp =3D xics_system_init(machine, > DIV_ROUND_UP(max_cpus * kvmppc_smt_thr= eads(), > smp_threads), > - XICS_IRQS); > + XICS_IRQS_SPAPR); > =20 > if (smc->dr_lmb_enabled) { > spapr_validate_node_memory(machine); > diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c > index 744ea62..3b3663e 100644 > --- a/hw/ppc/spapr_events.c > +++ b/hw/ppc/spapr_events.c > @@ -587,7 +587,7 @@ out_no_events: > void spapr_events_init(sPAPRMachineState *spapr) > { > QTAILQ_INIT(&spapr->pending_events); > - spapr->check_exception_irq =3D xics_alloc(spapr->icp, 0, 0, false); > + spapr->check_exception_irq =3D xics_spapr_alloc(spapr->icp, 0, 0, fa= lse); > spapr->epow_notifier.notify =3D spapr_powerdown_req; > qemu_register_powerdown_notifier(&spapr->epow_notifier); > spapr_rtas_register(RTAS_CHECK_EXCEPTION, "check-exception", > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 55fa8db..8b613a8 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -313,7 +313,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAP= RMachineState *spapr, > return; > } > =20 > - 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, num); > } > @@ -351,7 +351,7 @@ static void rtas_ibm_change_msi(PowerPCCPU *cpu, sPAP= RMachineState *spapr, > } > =20 > /* Allocate MSIs */ > - irq =3D xics_alloc_block(spapr->icp, 0, req_num, false, > + irq =3D xics_spapr_alloc_block(spapr->icp, 0, req_num, false, > ret_intr_type =3D=3D RTAS_TYPE_MSI); > if (!irq) { > error_report("Cannot allocate MSIs for device %x", config_addr); > @@ -1360,7 +1360,7 @@ static void spapr_phb_realize(DeviceState *dev, Err= or **errp) > for (i =3D 0; i < PCI_NUM_PINS; i++) { > uint32_t irq; > =20 > - irq =3D xics_alloc_block(spapr->icp, 0, 1, true, false); > + irq =3D xics_spapr_alloc_block(spapr->icp, 0, 1, true, false); > if (!irq) { > error_setg(errp, "spapr_allocate_lsi failed"); > return; > @@ -1717,7 +1717,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_S= PAPR)); > =20 > /* 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 c51eb8e..7b718cc 100644 > --- a/hw/ppc/spapr_vio.c > +++ b/hw/ppc/spapr_vio.c > @@ -462,7 +462,7 @@ static void spapr_vio_busdev_realize(DeviceState *qde= v, Error **errp) > dev->qdev.id =3D id; > } > =20 > - dev->irq =3D xics_alloc(spapr->icp, 0, dev->irq, false); > + dev->irq =3D xics_spapr_alloc(spapr->icp, 0, dev->irq, false); > if (!dev->irq) { > error_setg(errp, "can't allocate IRQ"); > return; > diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h > index 355a966..8d33dfa 100644 > --- a/include/hw/ppc/xics.h > +++ b/include/hw/ppc/xics.h > @@ -32,20 +32,20 @@ > #define TYPE_XICS_COMMON "xics-common" > #define XICS_COMMON(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_COMMON) > =20 > -#define TYPE_XICS "xics" > -#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS) > +#define TYPE_XICS_SPAPR "xics-spapr" > +#define XICS(obj) OBJECT_CHECK(XICSState, (obj), TYPE_XICS_SPAPR) > =20 > -#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) > =20 > #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) > =20 > #define XICS_IPI 0x2 > #define XICS_BUID 0x1 > @@ -157,13 +157,14 @@ struct ICSIRQState { > uint8_t flags; > }; > =20 > -#define XICS_IRQS 1024 > +#define XICS_IRQS_SPAPR 1024 > =20 > 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); > -int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool al= ign); > -void xics_free(XICSState *icp, int irq, int num); > + > +int xics_spapr_alloc(XICSState *icp, int src, int irq_hint, bool lsi); > +int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, b= ool align); > +void xics_spapr_free(XICSState *icp, int irq, int num); > =20 > void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu); > =20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --/Gk0KcsbyUMelFU1 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWU9iUAAoJEGw4ysog2bOSS7MP/iUhTo2nSgfEnWSuyT5UcA54 8jeriRvH/aGg7SnhlNJWDwY0VN8drU+5JuevINU3eoxe8cY+ZBYym3qwStXgUdAf WxwLL7ad/eMjBiLupmeJ4KWohawjUZbXoOuunNJSIrm6iAVvdAdJXFNZIui1Nlrp NSto8Pne00mg244PX8Bec3wmT+mBkmod9Fgla8sjAphpyLPL2lw5Fm9W36mRI1Wx s1DCDGOPh7w/hhbyQM+Aarw75KOLByYyEF1yAmZxW2AUFd/7ctIPqvjHPDPe6V6n 41fnmlb52a9W1l1nn7vNHI/R+S5K3NjvB8qx683Ijd83IJM7wpigU5vv0YCJgW9h Wtnz2PIGyTSrhYQVxq7Nhd17+qJPo+snKp6eYd05UK93TjUFGLUNWTsOtgv0rioA MSr8gsrOPOzxkifzA1Wh4VT2PBJbwXN3GXlsc1rBIymvnmAaODs5FjX0Hd9gSx3Q 9/+pZ2rnkMhmh4WobeAD/zk5dOiYl8QmpFKDwKH38slSAe/nQDBUnnehdXCkn/rV scE7P/yWzn+m7Gv12b06IcXMT2HcEiKytOis2G+1baAqm0MfOpf7EdxQbtw6iohU m+kZ21Vd6cRTzeyJIpKLKLdTp7TbDxLEkMIz989Ht5au4/SvlsisdyRO78+9eHpW vJ1z+Lrg9+vfMBbvZ3qX =LQH7 -----END PGP SIGNATURE----- --/Gk0KcsbyUMelFU1--