Commit 9e4a484b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.0-20190412' into staging 



ppc patch queue for 2018-04-12

Here's a last minute pull request for 4.0.  Turns out my last pull
request, to fix a regression in extended config space access for the
pseries machine didn't fix things hard enough.  This PR has a single
patch which improves the fix to work in more cases.

It's a ghastly, ghastly hack, but it's simple and localized.  I
already have patches almost ready to go in 4.1 that provides a simpler
and cleaner solution to all this.

# gpg: Signature made Fri 12 Apr 2019 06:34:16 BST
# gpg:                using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-4.0-20190412:
  spapr_pci: Fix broken naming of PCI bus

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 532cc6da 4560116e

hw/ppc/spapr_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1652,7 +1652,7 @@ static void spapr_phb_root_bus_class_init(ObjectClass *klass, void *data) 
    pbc->allows_extended_config_space = spapr_phb_allows_extended_config_space;

}



#define TYPE_SPAPR_PHB_ROOT_BUS "spapr-pci-host-bridge-root-bus"

#define TYPE_SPAPR_PHB_ROOT_BUS "pci"



static const TypeInfo spapr_phb_root_bus_info = {

    .name = TYPE_SPAPR_PHB_ROOT_BUS,
@@ -1761,7 +1761,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp) 
    memory_region_add_subregion(get_system_memory(), sphb->io_win_addr,

                                &sphb->iowindow);



    bus = pci_register_root_bus(dev, "pci.0",

    bus = pci_register_root_bus(dev, NULL,

                                pci_spapr_set_irq, pci_spapr_map_irq, sphb,

                                &sphb->memspace, &sphb->iospace,

                                PCI_DEVFN(0, 0), PCI_NUM_PINS,