Commit 4871dd4c authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

hw/ppc/spapr: Adjust firmware name for PCI bridges 

SLOF uses "pci" as name for PCI bridges nodes in the device tree instead
of "pci-bridges", so booting via bootindex from a device behind a PCI
bridge currently does not work since QEMU passes the wrong name in the
"qemu,boot-list" property. Fix it by changing the name of the PCI bridge
nodes to "pci" instead.

Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1459170


Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent a4d4edce

hw/ppc/spapr.c

+6 −0
Original line number Diff line number Diff line
@@ -2441,6 +2441,12 @@ static char *spapr_get_fw_dev_path(FWPathProvider *p, BusState *bus, 
        return g_strdup_printf("disk@%"PRIX64, (uint64_t)id << 32);

    }



    if (g_str_equal("pci-bridge", qdev_fw_name(dev))) {

        /* SLOF uses "pci" instead of "pci-bridge" for PCI bridges */

        PCIDevice *pcidev = CAST(PCIDevice, dev, TYPE_PCI_DEVICE);

        return g_strdup_printf("pci@%x", PCI_SLOT(pcidev->devfn));

    }



    return NULL;

}