Skip to content

Commit

Permalink
hw/pci: remove obsolete PCIDevice->init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
philmd authored and mstsirkin committed Mar 20, 2018
1 parent 056c339 commit 1d0cad5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
14 changes: 0 additions & 14 deletions hw/pci/pci.c
Expand Up @@ -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,
const char *name)
{
Expand Down Expand Up @@ -2533,13 +2521,11 @@ 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;
}

static void pci_device_class_base_init(ObjectClass *klass, void *data)
Expand Down
1 change: 0 additions & 1 deletion include/hw/pci/pci.h
Expand Up @@ -217,7 +217,6 @@ typedef struct PCIDeviceClass {
DeviceClass parent_class;

void (*realize)(PCIDevice *dev, Error **errp);
int (*init)(PCIDevice *dev);/* TODO convert to realize() and remove */
PCIUnregisterFunc *exit;
PCIConfigReadFunc *config_read;
PCIConfigWriteFunc *config_write;
Expand Down

0 comments on commit 1d0cad5

Please sign in to comment.