Commit 999c9caf authored by Greg Kurz's avatar Greg Kurz Committed by David Gibson
Browse files

spapr: move spapr_create_phb() to core machine code 



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: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 52804c60

hw/ppc/spapr.c

+12 −1
Original line number Diff line number Diff line
@@ -2552,6 +2552,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)

{
@@ -2784,7 +2795,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];

hw/ppc/spapr_pci.c

+0 −11
Original line number Diff line number Diff line
@@ -1988,17 +1988,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;

include/hw/pci-host/spapr.h

+0 −2
Original line number Diff line number Diff line
@@ -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);