diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-01-19 15:52:29 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-02-26 12:42:16 +0100 |
| commit | 7ee6c1e182cca6ccf5253569fca3d05826efb4e9 (patch) | |
| tree | 079aa8ac68eb59c17a1aa3a3da58efb9b8890c24 /hw | |
| parent | 133e9b228df16d11de01529c217417e78d1d9370 (diff) | |
pci: Permit incremental conversion of device models to realize
Call the new PCIDeviceClass method realize(). Default it to
pci_default_realize(), which calls old method init().
To convert a device model, make it implement realize() rather than
init().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci/pci.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index fe697b1544..b1f3cea9af 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1762,7 +1762,6 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pci_dev); Error *local_err = NULL; PCIBus *bus; - int rc; bool is_default_rom; /* initialize cap_present for pci_is_express() and pci_config_size() */ @@ -1777,11 +1776,11 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) if (pci_dev == NULL) return; - if (pc->init) { - rc = pc->init(pci_dev); - if (rc != 0) { + if (pc->realize) { + pc->realize(pci_dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); do_pci_unregister_device(pci_dev); - error_setg(errp, "Device initialization failed"); return; } } @@ -1801,6 +1800,18 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) } } +static void pci_default_realize(PCIDevice *dev, Error **errp) +{ + PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev); + + if (pc->init) { + if (pc->init(dev) < 0) { + error_setg(errp, "Device initialization failed"); + return; + } + } +} + PCIDevice *pci_create_multifunction(PCIBus *bus, int devfn, bool multifunction, const char *name) { @@ -2296,10 +2307,13 @@ MemoryRegion *pci_address_space_io(PCIDevice *dev) static void pci_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k = DEVICE_CLASS(klass); + PCIDeviceClass *pc = PCI_DEVICE_CLASS(klass); + k->realize = pci_qdev_realize; k->unrealize = pci_qdev_unrealize; k->bus_type = TYPE_PCI_BUS; k->props = pci_props; + pc->realize = pci_default_realize; } AddressSpace *pci_device_iommu_address_space(PCIDevice *dev) |