qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cédric Le Goater" <clg@kaod.org>
To: Jason Wang <jasowang@redhat.com>, qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Cédric Le Goater" <clg@kaod.org>
Subject: [Qemu-devel] [PATCH v2 08/11] net: smc91c111: convert SysBus init method to a realize method
Date: Mon,  1 Oct 2018 08:38:00 +0200	[thread overview]
Message-ID: <20181001063803.22330-9-clg@kaod.org> (raw)
In-Reply-To: <20181001063803.22330-1-clg@kaod.org>

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 hw/net/smc91c111.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index d2fd2040e81c..99da2d92973e 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -766,9 +766,9 @@ static NetClientInfo net_smc91c111_info = {
     .receive = smc91c111_receive,
 };
 
-static int smc91c111_init1(SysBusDevice *sbd)
+static void smc91c111_realize(DeviceState *dev, Error **errp)
 {
-    DeviceState *dev = DEVICE(sbd);
+    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
     smc91c111_state *s = SMC91C111(dev);
 
     memory_region_init_io(&s->mmio, OBJECT(s), &smc91c111_mem_ops, s,
@@ -780,7 +780,6 @@ static int smc91c111_init1(SysBusDevice *sbd)
                           object_get_typename(OBJECT(dev)), dev->id, s);
     qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
     /* ??? Save/restore.  */
-    return 0;
 }
 
 static Property smc91c111_properties[] = {
@@ -791,9 +790,8 @@ static Property smc91c111_properties[] = {
 static void smc91c111_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = smc91c111_init1;
+    dc->realize = smc91c111_realize;
     dc->reset = smc91c111_reset;
     dc->vmsd = &vmstate_smc91c111;
     dc->props = smc91c111_properties;
-- 
2.17.1

  parent reply	other threads:[~2018-10-01  6:39 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-01  6:37 [Qemu-devel] [PATCH v2 00/11] net: convert SysBus init method to a realize method Cédric Le Goater
2018-10-01  6:37 ` [Qemu-devel] [PATCH v2 01/11] net: etraxfs_eth: " Cédric Le Goater
2018-10-01  7:57   ` Philippe Mathieu-Daudé
2018-10-01  6:37 ` [Qemu-devel] [PATCH v2 02/11] net: etraxfs_eth: add a reset method Cédric Le Goater
2018-10-01  8:00   ` Philippe Mathieu-Daudé
2018-10-01  6:37 ` [Qemu-devel] [PATCH v2 03/11] net: lan9118: convert SysBus init method to a realize method Cédric Le Goater
2018-10-01  8:01   ` Philippe Mathieu-Daudé
2018-10-01  6:37 ` [Qemu-devel] [PATCH v2 04/11] net: lance: " Cédric Le Goater
2018-10-01  6:37 ` [Qemu-devel] [PATCH v2 05/11] net: milkymist_minimac2: " Cédric Le Goater
2018-10-01  7:46   ` Michael Walle
2018-10-01  6:37 ` [Qemu-devel] [PATCH v2 06/11] net: mipsnet: " Cédric Le Goater
2018-10-01  6:37 ` [Qemu-devel] [PATCH v2 07/11] net: opencores_eth: " Cédric Le Goater
2018-10-01  7:51   ` Max Filippov
2018-10-01  6:38 ` Cédric Le Goater [this message]
2018-10-01  8:01   ` [Qemu-devel] [PATCH v2 08/11] net: smc91c111: " Philippe Mathieu-Daudé
2018-10-01  6:38 ` [Qemu-devel] [PATCH v2 09/11] net: stellaris_enet: " Cédric Le Goater
2018-10-01  6:38 ` [Qemu-devel] [PATCH v2 10/11] net: stellaris_enet: add a reset method Cédric Le Goater
2018-10-01  6:38 ` [Qemu-devel] [PATCH v2 11/11] net: xgmac: convert SysBus init method to a realize method Cédric Le Goater
2018-10-10 13:30 ` [Qemu-devel] [PATCH v2 00/11] net: " Philippe Mathieu-Daudé
2018-10-11 17:47   ` Eduardo Habkost

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=20181001063803.22330-9-clg@kaod.org \
    --to=clg@kaod.org \
    --cc=f4bug@amsat.org \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --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).