ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/pci: remove obsolete PCIDevice->init() 

All PCI devices are now QOM'ified.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2017-12-17 17:49:12 -03:00 committed by Michael S. Tsirkin
parent 056c339d97
commit 1d0cad532c
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/pci/pci.c
View File

@ -2049,18 +2049,6 @@ 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)
{ {
@ -2533,13 +2521,11 @@ 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;
} }
static void pci_device_class_base_init(ObjectClass *klass, void *data) static void pci_device_class_base_init(ObjectClass *klass, void *data)

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

@ -217,7 +217,6 @@ typedef struct PCIDeviceClass {
DeviceClass parent_class; DeviceClass parent_class;
void (*realize)(PCIDevice *dev, Error **errp); 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;