summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCao jin <caoj.fnst@cn.fujitsu.com>2016-01-15 10:23:31 +0800
committerMichael S. Tsirkin <mst@redhat.com>2016-02-16 12:05:18 +0200
commit33c28f3bde02e6dd69da58f9a8b7e4a50c616849 (patch)
treef37d3e21a92c69dbd389a2b7efdafbae60b37df4
parent4e082566a9cd17e5f00d0df85a67dc7a086d30b0 (diff)
downloadfocaccia-qemu-33c28f3bde02e6dd69da58f9a8b7e4a50c616849.tar.gz
focaccia-qemu-33c28f3bde02e6dd69da58f9a8b7e4a50c616849.zip
dec: convert to realize()
Also because pci_bridge_initfn() can`t fail.

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/pci-bridge/dec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/pci-bridge/dec.c b/hw/pci-bridge/dec.c
index 40ff0d0632..840c96198a 100644
--- a/hw/pci-bridge/dec.c
+++ b/hw/pci-bridge/dec.c
@@ -52,9 +52,9 @@ static int dec_map_irq(PCIDevice *pci_dev, int irq_num)
     return irq_num;
 }
 
-static int dec_pci_bridge_initfn(PCIDevice *pci_dev)
+static void dec_pci_bridge_realize(PCIDevice *pci_dev, Error **errp)
 {
-    return pci_bridge_initfn(pci_dev, TYPE_PCI_BUS);
+    pci_bridge_initfn(pci_dev, TYPE_PCI_BUS);
 }
 
 static void dec_21154_pci_bridge_class_init(ObjectClass *klass, void *data)
@@ -62,7 +62,7 @@ static void dec_21154_pci_bridge_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 
-    k->init = dec_pci_bridge_initfn;
+    k->realize = dec_pci_bridge_realize;
     k->exit = pci_bridge_exitfn;
     k->vendor_id = PCI_VENDOR_ID_DEC;
     k->device_id = PCI_DEVICE_ID_DEC_21154;