[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/41] apb: convert init to realize
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 08/41] apb: convert init to realize |
Date: |
Fri, 29 Jul 2016 06:15:28 +0300 |
From: Wei Jiangang <address@hidden>
Convert a device model where initialization obviously can't fail,
make it implement realize() rather than init().
Signed-off-by: Wei Jiangang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
hw/pci-host/apb.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c
index 16587f8..653e711 100644
--- a/hw/pci-host/apb.c
+++ b/hw/pci-host/apb.c
@@ -634,7 +634,7 @@ static void pci_apb_set_irq(void *opaque, int irq_num, int
level)
}
}
-static int apb_pci_bridge_initfn(PCIDevice *dev)
+static void apb_pci_bridge_realize(PCIDevice *dev, Error **errp)
{
pci_bridge_initfn(dev, TYPE_PCI_BUS);
@@ -652,7 +652,6 @@ static int apb_pci_bridge_initfn(PCIDevice *dev)
pci_set_word(dev->config + PCI_STATUS,
PCI_STATUS_FAST_BACK | PCI_STATUS_66MHZ |
PCI_STATUS_DEVSEL_MEDIUM);
- return 0;
}
PCIBus *pci_apb_init(hwaddr special_base,
@@ -843,7 +842,7 @@ static void pbm_pci_bridge_class_init(ObjectClass *klass,
void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
- k->init = apb_pci_bridge_initfn;
+ k->realize = apb_pci_bridge_realize;
k->exit = pci_bridge_exitfn;
k->vendor_id = PCI_VENDOR_ID_SUN;
k->device_id = PCI_DEVICE_ID_SUN_SIMBA;
--
MST
- [Qemu-devel] [PULL 00/41] pc, pci, virtio: cleanups, fixes, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 02/41] hw/pcie-root-port: Fix PCIe root port initialization, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 01/41] pcie: fix link active status bit migration, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 03/41] hw/pxb: declare pxb devices as not hot-pluggable, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 04/41] hw/acpi: fix a DSDT table issue when a pxb is present., Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 05/41] acpi: refactor pxb crs computation, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 06/41] hw/apci: handle 64-bit MMIO regions correctly, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 07/41] hw/pci-bridge: Convert pxb initialization functions to Error, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 08/41] apb: convert init to realize,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 09/41] hw/virtio-pci: fix virtio behaviour, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 10/41] virtio: check vring descriptor buffer length, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 11/41] misc: indentation, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 12/41] vhost-user: minor simplification, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 13/41] vhost-user: disconnect on HUP, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 15/41] vhost: make vhost_log_put() idempotent, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 14/41] vhost: don't assume opaque is a fd, use backend cleanup, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 16/41] vhost: assert the log was cleaned up, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 17/41] vhost: fix cleanup on not fully initialized device, Michael S. Tsirkin, 2016/07/28
- [Qemu-devel] [PULL 18/41] vhost: make vhost_dev_cleanup() idempotent, Michael S. Tsirkin, 2016/07/28