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

spapr_pci: Get rid of duplicate code for node name creation 



According to the changelog of 298a9710, SpaprPhbState::dtbusname was
introduced to "make it easier to relate the guest and qemu views of memory
to each other", hence its name.

Use it when creating the PHB node to avoid code duplication.

Signed-off-by: default avatarGreg Kurz <groug@kaod.org>
Message-Id: <155448184292.8446.8225650773162648595.stgit@bahia.lan>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent eb512d15

hw/ppc/spapr_pci.c

+1 −4
Original line number Diff line number Diff line
@@ -2176,7 +2176,6 @@ int spapr_populate_pci_dt(SpaprPhbState *phb, uint32_t intc_phandle, void *fdt, 
                          uint32_t nr_msis, int *node_offset)

{

    int bus_off, i, j, ret;

    gchar *nodename;

    uint32_t bus_range[] = { cpu_to_be32(0), cpu_to_be32(0xff) };

    struct {

        uint32_t hi;
@@ -2227,9 +2226,7 @@ int spapr_populate_pci_dt(SpaprPhbState *phb, uint32_t intc_phandle, void *fdt, 
    Error *errp = NULL;



    /* Start populating the FDT */

    nodename = g_strdup_printf("pci@%" PRIx64, phb->buid);

    _FDT(bus_off = fdt_add_subnode(fdt, 0, nodename));

    g_free(nodename);

    _FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname));

    if (node_offset) {

        *node_offset = bus_off;

    }