Commit 1d0cad53 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Michael S. Tsirkin
Browse files

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



All PCI devices are now QOM'ified.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 056c339d

hw/pci/pci.c

+0 −14
Original line number Diff line number Diff line
@@ -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)

{
@@ -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)

include/hw/pci/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -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;