[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/11] net: smc91c111: convert SysBus init method
From: |
Cédric Le Goater |
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 |
Signed-off-by: Cédric Le Goater <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 02/11] net: etraxfs_eth: add a reset method, (continued)
- [Qemu-devel] [PATCH v2 02/11] net: etraxfs_eth: add a reset method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 01/11] net: etraxfs_eth: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 04/11] net: lance: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 03/11] net: lan9118: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 05/11] net: milkymist_minimac2: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 06/11] net: mipsnet: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 08/11] net: smc91c111: convert SysBus init method to a realize method,
Cédric Le Goater <=
- [Qemu-devel] [PATCH v2 07/11] net: opencores_eth: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 09/11] net: stellaris_enet: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 10/11] net: stellaris_enet: add a reset method, Cédric Le Goater, 2018/10/01
- [Qemu-devel] [PATCH v2 11/11] net: xgmac: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- Re: [Qemu-devel] [PATCH v2 00/11] net: convert SysBus init method to a realize method, Philippe Mathieu-Daudé, 2018/10/10