From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, arei.gonglei@huawei.com, kraxel@redhat.com,
afaerber@suse.de, mst@redhat.com
Subject: [Qemu-devel] [PATCH RFC 05/10] pcnet: Convert to realize
Date: Tue, 28 Oct 2014 08:35:34 +0100 [thread overview]
Message-ID: <1414481739-19939-6-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1414481739-19939-1-git-send-email-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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
next prev parent reply other threads:[~2014-10-28 7:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 7:35 [Qemu-devel] [PATCH RFC 00/10] pci: Partial conversion to realize Markus Armbruster
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 01/10] pci: Convert core " Markus Armbruster
2014-10-28 8:32 ` Gonglei
2014-10-28 9:38 ` Markus Armbruster
2014-10-30 16:58 ` Marcel Apfelbaum
2014-10-30 17:02 ` Marcel Apfelbaum
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 02/10] pci: Permit incremental conversion of device models " Markus Armbruster
2014-10-28 8:35 ` Gonglei
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 03/10] pci: Trivial device model conversions " Markus Armbruster
2014-10-28 8:38 ` Gonglei
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 04/10] pcnet: pcnet_common_init() always returns 0, change to void Markus Armbruster
2014-10-28 8:42 ` Gonglei
2014-10-28 9:41 ` Markus Armbruster
2014-10-28 10:35 ` Gonglei
2014-10-28 7:35 ` Markus Armbruster [this message]
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 06/10] serial-pci: Convert to realize Markus Armbruster
2014-10-28 8:43 ` Gonglei
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 07/10] ide/ich: " Markus Armbruster
2014-10-28 8:44 ` Gonglei
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 08/10] cirrus-vga: " Markus Armbruster
2014-10-28 8:44 ` Gonglei
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 09/10] qxl: " Markus Armbruster
2014-10-28 8:46 ` Gonglei
2014-10-28 7:35 ` [Qemu-devel] [PATCH RFC 10/10] pci-assign: " Markus Armbruster
2014-10-28 8:49 ` Gonglei
2014-10-28 8:27 ` [Qemu-devel] [PATCH RFC 00/10] pci: Partial conversion " Gonglei
2014-10-30 14:01 ` Andreas Färber
2014-11-03 7:40 ` Markus Armbruster
2015-01-19 15:21 ` Markus Armbruster
2015-01-30 9:17 ` Markus Armbruster
2014-11-02 11:20 ` Michael S. Tsirkin
2014-11-03 7:22 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414481739-19939-6-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=afaerber@suse.de \
--cc=arei.gonglei@huawei.com \
--cc=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).