From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCQf-0000Rr-8e for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:45:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YOCQe-00036r-IC for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:45:09 -0500 Received: from mail.kernel.org ([198.145.29.136]:51289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YOCQe-000360-Dc for qemu-devel@nongnu.org; Wed, 18 Feb 2015 16:45:08 -0500 Date: Wed, 18 Feb 2015 22:45:01 +0100 From: "Michael S. Tsirkin" Message-ID: <1424295164-4774-11-git-send-email-mst@redhat.com> References: <1424295164-4774-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424295164-4774-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 10/96] pcnet: Convert to realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Juan Quintela , dgilbert@redhat.com, Markus Armbruster , Gonglei , Gerd Hoffmann , Paolo Bonzini From: Markus Armbruster Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Gonglei --- hw/net/pcnet-pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c index 9677c12..8305d1b 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; -- MST