[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 05/10] pcnet: Convert to realize
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 05/10] pcnet: Convert to realize |
Date: |
Tue, 28 Oct 2014 08:35:34 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
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 50eb069..e5122a0 100644
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -297,7 +297,7 @@ static NetClientInfo net_pci_pcnet_info = {
.cleanup = pci_pcnet_cleanup,
};
-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;
@@ -336,7 +336,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)
@@ -366,7 +365,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;
--
1.9.3
- [Qemu-devel] [PATCH RFC 04/10] pcnet: pcnet_common_init() always returns 0, change to void, (continued)
- [Qemu-devel] [PATCH RFC 10/10] pci-assign: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 06/10] serial-pci: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 02/10] pci: Permit incremental conversion of device models to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 05/10] pcnet: Convert to realize,
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 07/10] ide/ich: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 08/10] cirrus-vga: Convert to realize, Markus Armbruster, 2014/10/28
- [Qemu-devel] [PATCH RFC 09/10] qxl: Convert to realize, Markus Armbruster, 2014/10/28
- Re: [Qemu-devel] [PATCH RFC 00/10] pci: Partial conversion to realize, Gonglei, 2014/10/28
- Re: [Qemu-devel] [PATCH RFC 00/10] pci: Partial conversion to realize, Andreas Färber, 2014/10/31