summaryrefslogtreecommitdiff
path: root/hw/openpic.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2009-11-15 14:30:03 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-11-15 14:30:03 +0000
commitc364c974d9ab90e25e7887f516da65d2811ba5e3 (patch)
tree60f36af6af7556ee70b697fe6932105f158b7192 /hw/openpic.c
parent3e65aaf5b2a01272fcd71d9b4efa7fe94c9c11af (diff)
downloadqemu-c364c974d9ab90e25e7887f516da65d2811ba5e3.tar.gz
PCI: make duplicate devfn allocation fatal
Only two callers of pci_create_simple/pci_register_device bothered to check the return value. Other cases were prone to crashing with spurious NULL pointer dereferences. Make QEMU exit with an error message when devfn is attempted to be duplicated, also applies to case when the bus is full. Remove checks. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/openpic.c')
-rw-r--r--hw/openpic.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/openpic.c b/hw/openpic.c
index 68af9c1de1..42db59daa7 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -1202,8 +1202,6 @@ qemu_irq *openpic_init (PCIBus *bus, int *pmem_index, int nb_cpus,
if (bus) {
opp = (openpic_t *)pci_register_device(bus, "OpenPIC", sizeof(openpic_t),
-1, NULL, NULL);
- if (opp == NULL)
- return NULL;
pci_conf = opp->pci_dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_IBM);
pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_IBM_OPENPIC2);