Revision a213ff63 hw/pci.c

b/hw/pci.c
1693 1693
        pci_dev->romfile = qemu_strdup(info->romfile);
1694 1694
    pci_add_option_rom(pci_dev);
1695 1695

  
1696
    if (qdev->hotplugged)
1697
        bus->hotplug(bus->hotplug_qdev, pci_dev, 1);
1696
    if (qdev->hotplugged) {
1697
        rc = bus->hotplug(bus->hotplug_qdev, pci_dev, 1);
1698
        if (rc != 0) {
1699
            int r = pci_unregister_device(&pci_dev->qdev);
1700
            assert(!r);
1701
            return rc;
1702
        }
1703
    }
1698 1704
    return 0;
1699 1705
}
1700 1706

  
......
1702 1708
{
1703 1709
    PCIDevice *dev = DO_UPCAST(PCIDevice, qdev, qdev);
1704 1710

  
1705
    dev->bus->hotplug(dev->bus->hotplug_qdev, dev, 0);
1706
    return 0;
1711
    return dev->bus->hotplug(dev->bus->hotplug_qdev, dev, 0);
1707 1712
}
1708 1713

  
1709 1714
void pci_qdev_register(PCIDeviceInfo *info)

Also available in: Unified diff