Commit 7ee6c1e1 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarGonglei <arei.gonglei@huawei.com>
parent 133e9b22

hw/pci/pci.c

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

include/hw/pci/pci.h

+2 −1
Original line number Diff line number Diff line
@@ -185,7 +185,8 @@ typedef struct PCIINTxRoute { 
typedef struct PCIDeviceClass {

    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;

    PCIConfigReadFunc *config_read;

    PCIConfigWriteFunc *config_write;