diff options
| author | Wei Jiangang <weijg.fnst@cn.fujitsu.com> | 2016-05-17 18:18:47 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-07-29 00:07:09 +0300 |
| commit | be0d9760d7fa30e50ded15956f06506d993cbc88 (patch) | |
| tree | ec953e0005a289ceef708dcaf00c05ff63870cae /hw/pci-host/apb.c | |
| parent | 86395eb31f5c7bf919ed456c3c410720243f733a (diff) | |
| download | focaccia-qemu-be0d9760d7fa30e50ded15956f06506d993cbc88.tar.gz focaccia-qemu-be0d9760d7fa30e50ded15956f06506d993cbc88.zip | |
apb: convert init to realize
Convert a device model where initialization obviously can't fail, make it implement realize() rather than init(). Signed-off-by: Wei Jiangang <weijg.fnst@cn.fujitsu.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | hw/pci-host/apb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/pci-host/apb.c b/hw/pci-host/apb.c index 16587f8373..653e711121 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; |