Fix do_pci_register_device() to reject devfn already in use

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/pci.c b/hw/pci.c
index 140cdbaa29e6f5b0c7f1ab5fe1fdb6c3f61d51c0..da76ecd34218e0f5198236413a8342b1da19f913 100644 (file)
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -267,6 +267,8 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
         }
         return NULL;
     found: ;
+    } else if (bus->devices[devfn]) {
+        return NULL;
     }
     pci_dev->bus = bus;
     pci_dev->devfn = devfn;