Commit 7411aa63 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

pci: New pci_new(), pci_realize_and_unref() etc. 



I'm converting from qdev_create()/qdev_init_nofail() to
qdev_new()/qdev_realize_and_unref(); recent commit "qdev: New
qdev_new(), qdev_realize(), etc." explains why.

PCI devices use qdev_create() through pci_create() and
pci_create_multifunction().

Provide pci_new(), pci_new_multifunction(), and
pci_realize_and_unref() for converting PCI devices.

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-14-armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 68424112

hw/pci/pci.c

+21 −0
Original line number Diff line number Diff line
@@ -2163,6 +2163,27 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) 
    }

}



PCIDevice *pci_new_multifunction(int devfn, bool multifunction,

                                 const char *name)

{

    DeviceState *dev;



    dev = qdev_new(name);

    qdev_prop_set_int32(dev, "addr", devfn);

    qdev_prop_set_bit(dev, "multifunction", multifunction);

    return PCI_DEVICE(dev);

}



PCIDevice *pci_new(int devfn, const char *name)

{

    return pci_new_multifunction(devfn, false, name);

}



bool pci_realize_and_unref(PCIDevice *dev, PCIBus *bus, Error **errp)

{

    return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp);

}



PCIDevice *pci_create_multifunction(PCIBus *bus, int devfn, bool multifunction,

                                    const char *name)

{

include/hw/pci/pci.h

+5 −0
Original line number Diff line number Diff line
@@ -712,6 +712,11 @@ pci_get_quad_by_mask(uint8_t *config, uint64_t mask) 
    return (val & mask) >> ctz32(mask);

}



PCIDevice *pci_new_multifunction(int devfn, bool multifunction,

                                    const char *name);

PCIDevice *pci_new(int devfn, const char *name);

bool pci_realize_and_unref(PCIDevice *dev, PCIBus *bus, Error **errp);



PCIDevice *pci_create_multifunction(PCIBus *bus, int devfn, bool multifunction,

                                    const char *name);

PCIDevice *pci_create_simple_multifunction(PCIBus *bus, int devfn,