openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Armbruster 2015-01-19 15:52:29 +01:00 committed by Michael S. Tsirkin
parent 133e9b228d
commit 7ee6c1e182
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/pci/pci.c
View File

@ -1762,7 +1762,6 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp)
PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pci_dev); PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pci_dev);
Error *local_err = NULL; Error *local_err = NULL;
PCIBus *bus; PCIBus *bus;
int rc;
bool is_default_rom; bool is_default_rom;
/* initialize cap_present for pci_is_express() and pci_config_size() */ /* 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) if (pci_dev == NULL)
return; return;
if (pc->init) { if (pc->realize) {
rc = pc->init(pci_dev); pc->realize(pci_dev, &local_err);
if (rc != 0) { if (local_err) {
error_propagate(errp, local_err);
do_pci_unregister_device(pci_dev); do_pci_unregister_device(pci_dev);
error_setg(errp, "Device initialization failed");
return; 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, PCIDevice *pci_create_multifunction(PCIBus *bus, int devfn, bool multifunction,
const char *name) const char *name)
{ {
@ -2296,10 +2307,13 @@ MemoryRegion *pci_address_space_io(PCIDevice *dev)
static void pci_device_class_init(ObjectClass *klass, void *data) static void pci_device_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *k = DEVICE_CLASS(klass); DeviceClass *k = DEVICE_CLASS(klass);
PCIDeviceClass *pc = PCI_DEVICE_CLASS(klass);
k->realize = pci_qdev_realize; k->realize = pci_qdev_realize;
k->unrealize = pci_qdev_unrealize; k->unrealize = pci_qdev_unrealize;
k->bus_type = TYPE_PCI_BUS; k->bus_type = TYPE_PCI_BUS;
k->props = pci_props; k->props = pci_props;
pc->realize = pci_default_realize;
} }
AddressSpace *pci_device_iommu_address_space(PCIDevice *dev) AddressSpace *pci_device_iommu_address_space(PCIDevice *dev)

3
include/hw/pci/pci.h
View File

@ -185,7 +185,8 @@ typedef struct PCIINTxRoute {
typedef struct PCIDeviceClass { typedef struct PCIDeviceClass {
DeviceClass parent_class; DeviceClass parent_class;
int (*init)(PCIDevice *dev); void (*realize)(PCIDevice *dev, Error **errp);
int (*init)(PCIDevice *dev);/* TODO convert to realize() and remove */
PCIUnregisterFunc *exit; PCIUnregisterFunc *exit;
PCIConfigReadFunc *config_read; PCIConfigReadFunc *config_read;
PCIConfigWriteFunc *config_write; PCIConfigWriteFunc *config_write;