From: Markus Armbruster <armbru@redhat.com>
Date: Mon, 19 Jan 2015 14:52:32 +0000 (+0100)
Subject: pcnet: Convert to realize
X-Git-Tag: v2.7.1~1259^2~120
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=eb1bef94b4067b19abac91fec001c690a58b2174;p=mirror_qemu.git

pcnet: Convert to realize

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
---

diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index 9677c1215a..8305d1bdf2 100644
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -278,7 +278,7 @@ static NetClientInfo net_pci_pcnet_info = {
     .link_status_changed = pcnet_set_link_status,
 };
 
-static int pci_pcnet_init(PCIDevice *pci_dev)
+static void pci_pcnet_realize(PCIDevice *pci_dev, Error **errp)
 {
     PCIPCNetState *d = PCI_PCNET(pci_dev);
     PCNetState *s = &d->state;
@@ -317,7 +317,6 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
     s->dma_opaque = pci_dev;
 
     pcnet_common_init(DEVICE(pci_dev), s, &net_pci_pcnet_info);
-    return 0;
 }
 
 static void pci_reset(DeviceState *dev)
@@ -347,7 +346,7 @@ static void pcnet_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 
-    k->init = pci_pcnet_init;
+    k->realize = pci_pcnet_realize;
     k->exit = pci_pcnet_uninit;
     k->romfile = "efi-pcnet.rom",
     k->vendor_id = PCI_VENDOR_ID_AMD;