[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 02/10] pci: Permit incremental conversion of dev
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 02/10] pci: Permit incremental conversion of device models to realize |
Date: |
Tue, 28 Oct 2014 08:35:31 +0100 |
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: Markus Armbruster <address@hidden>
---
hw/pci/pci.c | 24 +++++++++++++++++++-----
include/hw/pci/pci.h | 3 ++-
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index aef95c3..e21c0a8 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1753,7 +1753,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() */
@@ -1768,11 +1767,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;
}
}
@@ -1792,6 +1791,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)
{
@@ -2286,10 +2297,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)
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index c352c7b..83597b3 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -183,7 +183,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;
--
1.9.3
- [Qemu-devel] [PATCH RFC 03/10] pci: Trivial device model conversions to realize, (continued)
- [Qemu-devel] [PATCH RFC 10/10] pci-assign: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 06/10] serial-pci: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 02/10] pci: Permit incremental conversion of device models to realize,
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 05/10] pcnet: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 07/10] ide/ich: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 08/10] cirrus-vga: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 09/10] qxl: Convert to realize, Markus Armbruster, 2014/10/28
- Re: [Qemu-devel] [PATCH RFC 00/10] pci: Partial conversion to realize, Gonglei, 2014/10/28
- Re: [Qemu-devel] [PATCH RFC 00/10] pci: Partial conversion to realize, Andreas Färber, 2014/10/31