From: Marcel Apfelbaum <marcel@redhat.com>
Date: Mon, 18 Jan 2016 15:27:26 +0000 (+0200)
Subject: hw/pci: ensure that only PCI/PCIe bridges can be attached to pxb/pxb-pcie devices
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0144f6f1ce536b2c56a9b16ef189fc81c3bcb82f;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

hw/pci: ensure that only PCI/PCIe bridges can be attached to pxb/pxb-pcie devices

PCI devices can't be plugged directly into PCI extra root bridges
because their resources can't be computed by firmware before the ACPI
tables are loaded.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index d940f79de..b282120b1 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -851,6 +851,13 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
     DeviceState *dev = DEVICE(pci_dev);
 
     pci_dev->bus = bus;
+    /* Only pci bridges can be attached to extra PCI root buses */
+    if (pci_bus_is_root(bus) && bus->parent_dev && !pc->is_bridge) {
+        error_setg(errp,
+                   "PCI: Only PCI/PCIe bridges can be plugged into %s",
+                    bus->parent_dev->name);
+        return NULL;
+    }
 
     if (devfn < 0) {
         for(devfn = bus->devfn_min ; devfn < ARRAY_SIZE(bus->devices);