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.
> 
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

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(-)
> 
> 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;
>  }
>  
> -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 = &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 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)
> +int xics_spapr_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align)
>  {
>      int i, first = -1;
>      ICSState *ics = &icp->ics[src];
> @@ -787,7 +787,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);
>  
> @@ -1006,7 +1006,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;
> @@ -1045,7 +1045,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);
>  
> @@ -1054,29 +1054,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 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 = 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,
> @@ -500,7 +500,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 610629e..bf94426 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -119,7 +119,7 @@ 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_report("kernel_irqchip requested but unavailable: %s",
> @@ -128,7 +128,7 @@ static XICSState *xics_system_init(MachineState *machine,
>      }
>  
>      if (!icp) {
> -        icp = try_create_xics(TYPE_XICS, nr_servers, nr_irqs, &error_abort);
> +        icp = try_create_xics(TYPE_XICS_SPAPR, nr_servers, nr_irqs, &error_abort);
>      }
>  
>      return icp;
> @@ -1768,7 +1768,7 @@ static void ppc_spapr_init(MachineState *machine)
>      spapr->icp = xics_system_init(machine,
>                                    DIV_ROUND_UP(max_cpus * kvmppc_smt_threads(),
>                                                 smp_threads),
> -                                  XICS_IRQS);
> +                                  XICS_IRQS_SPAPR);
>  
>      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 = xics_alloc(spapr->icp, 0, 0, false);
> +    spapr->check_exception_irq = xics_spapr_alloc(spapr->icp, 0, 0, false);
>      spapr->epow_notifier.notify = 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, 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, num);
>          }
> @@ -351,7 +351,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);
>      if (!irq) {
>          error_report("Cannot allocate MSIs for device %x", config_addr);
> @@ -1360,7 +1360,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
>      for (i = 0; i < PCI_NUM_PINS; i++) {
>          uint32_t irq;
>  
> -        irq = xics_alloc_block(spapr->icp, 0, 1, true, false);
> +        irq = 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_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 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 *qdev, Error **errp)
>          dev->qdev.id = id;
>      }
>  
> -    dev->irq = xics_alloc(spapr->icp, 0, dev->irq, false);
> +    dev->irq = 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)
>  
> -#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)
>  
> -#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,13 +157,14 @@ 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);
> -int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align);
> -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, bool align);
> +void xics_spapr_free(XICSState *icp, int irq, int num);
>  
>  void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);
>  

-- 
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