From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 26 Mar 2013 21:16:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'mst/tags/for_anthony' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~2252
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=404e7a4f4af753bd2aef649adf79e7434fb6dc31;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'mst/tags/for_anthony' into staging

virtio,pci,qom

Work by Alex to support VGA assignment,
pci and virtio fixes by Stefan, Jason and myself, and a
new qmp event for hotplug support by myself.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Tue 26 Mar 2013 02:02:24 PM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Alex Williamson (13) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony: (23 commits)
  pcie: Add endpoint capability initialization wrapper
  roms: switch oldnoconfig to olddefconfig
  pcie: Mangle types to match topology
  pci: Create and use API to determine root buses
  pci: Create pci_bus_is_express helper
  pci: Q35, Root Ports, and Switches create PCI Express buses
  pci: Allow PCI bus creation interfaces to specify the type of bus
  pci: Move PCI and PCIE type defines
  pci: Create and register a new PCI Express TypeInfo
  exec: assert that RAMBlock size is non-zero
  pci: refuse empty ROM files
  pci_bridge: Remove duplicate IRQ swizzle function
  pci_bridge: Use a default map_irq function
  pci: Fix INTx routing notifier recursion
  pci_bridge: drop formatting from source
  pci_bridge: factor out common code
  pci: Teach PCI Bridges about VGA routing
  pci: Add PCI VGA helpers
  virtio-pci: guest notifier mask without non-irqfd
  virtio-net: remove layout assumptions for mq ctrl
  ...
---

404e7a4f4af753bd2aef649adf79e7434fb6dc31
diff --cc hw/spapr_pci.c
index 42c8b61,20b9015..3e0d8d1
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@@ -619,29 -621,10 +619,29 @@@ static int spapr_phb_init(SysBusDevice 
                                      &sphb->msiwindow);
      }
  
 -    bus = pci_register_bus(DEVICE(s), sphb->busname,
 +    /*
 +     * Selecting a busname is more complex than you'd think, due to
 +     * interacting constraints.  If the user has specified an id
 +     * explicitly for the phb , then we want to use the qdev default
 +     * of naming the bus based on the bridge device (so the user can
 +     * then assign devices to it in the way they expect).  For the
 +     * first / default PCI bus (index=0) we want to use just "pci"
 +     * because libvirt expects there to be a bus called, simply,
 +     * "pci".  Otherwise, we use the same name as in the device tree,
 +     * since it's unique by construction, and makes the guest visible
 +     * BUID clear.
 +     */
 +    if (s->qdev.id) {
 +        busname = NULL;
 +    } else if (sphb->index == 0) {
 +        busname = "pci";
 +    } else {
 +        busname = sphb->dtbusname;
 +    }
 +    bus = pci_register_bus(DEVICE(s), busname,
                             pci_spapr_set_irq, pci_spapr_map_irq, sphb,
                             &sphb->memspace, &sphb->iospace,
-                            PCI_DEVFN(0, 0), PCI_NUM_PINS);
+                            PCI_DEVFN(0, 0), PCI_NUM_PINS, TYPE_PCI_BUS);
      phb->bus = bus;
  
      sphb->dma_window_start = 0;