On Fri, Dec 21, 2018 at 01:35:09AM +0100, Greg Kurz wrote: > This function is only used when creating the default PHB. Let's rename > it and move it to the core machine code for clarity. > > Signed-off-by: Greg Kurz <gr...@kaod.org> > Reviewed-by: Alexey Kardashevskiy <a...@ozlabs.ru> > Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
Applied to ppc-for-4.0, thanks.
> ---
> hw/ppc/spapr.c | 13 ++++++++++++-
> hw/ppc/spapr_pci.c | 11 -----------
> include/hw/pci-host/spapr.h | 2 --
> 3 files changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 8ea680fcde1e..1f17b5d01f4f 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2551,6 +2551,17 @@ static void spapr_init_cpus(sPAPRMachineState *spapr)
> }
> }
>
> +static PCIHostState *spapr_create_default_phb(void)
> +{
> + DeviceState *dev;
> +
> + dev = qdev_create(NULL, TYPE_SPAPR_PCI_HOST_BRIDGE);
> + qdev_prop_set_uint32(dev, "index", 0);
> + qdev_init_nofail(dev);
> +
> + return PCI_HOST_BRIDGE(dev);
> +}
> +
> /* pSeries LPAR / sPAPR hardware init */
> static void spapr_machine_init(MachineState *machine)
> {
> @@ -2782,7 +2793,7 @@ static void spapr_machine_init(MachineState *machine)
> /* Set up PCI */
> spapr_pci_rtas_init();
>
> - phb = spapr_create_phb(spapr, 0);
> + phb = spapr_create_default_phb();
>
> for (i = 0; i < nb_nics; i++) {
> NICInfo *nd = &nd_table[i];
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 2374d55fc112..e59adbe706bb 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -1979,17 +1979,6 @@ static const TypeInfo spapr_phb_info = {
> }
> };
>
> -PCIHostState *spapr_create_phb(sPAPRMachineState *spapr, int index)
> -{
> - DeviceState *dev;
> -
> - dev = qdev_create(NULL, TYPE_SPAPR_PCI_HOST_BRIDGE);
> - qdev_prop_set_uint32(dev, "index", index);
> - qdev_init_nofail(dev);
> -
> - return PCI_HOST_BRIDGE(dev);
> -}
> -
> typedef struct sPAPRFDT {
> void *fdt;
> int node_off;
> diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
> index 7c66c3872f96..a65cfef16945 100644
> --- a/include/hw/pci-host/spapr.h
> +++ b/include/hw/pci-host/spapr.h
> @@ -111,8 +111,6 @@ static inline qemu_irq spapr_phb_lsi_qirq(struct
> sPAPRPHBState *phb, int pin)
> return spapr_qirq(spapr, phb->lsi_table[pin].irq);
> }
>
> -PCIHostState *spapr_create_phb(sPAPRMachineState *spapr, int index);
> -
> int spapr_populate_pci_dt(sPAPRPHBState *phb, uint32_t xics_phandle, void
> *fdt,
> uint32_t nr_msis);
>
>
--
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
signature.asc
Description: PGP signature
