[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/11] net: opencores_eth: convert SysBus init me
From: |
Cédric Le Goater |
Subject: |
[Qemu-devel] [PATCH v2 07/11] net: opencores_eth: convert SysBus init method to a realize method |
Date: |
Mon, 1 Oct 2018 08:37:59 +0200 |
Cc: Max Filippov <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/net/opencores_eth.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
index d42b79c08c6a..d6f54f8d8208 100644
--- a/hw/net/opencores_eth.c
+++ b/hw/net/opencores_eth.c
@@ -715,9 +715,9 @@ static const MemoryRegionOps open_eth_desc_ops = {
.write = open_eth_desc_write,
};
-static int sysbus_open_eth_init(SysBusDevice *sbd)
+static void sysbus_open_eth_realize(DeviceState *dev, Error **errp)
{
- DeviceState *dev = DEVICE(sbd);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
OpenEthState *s = OPEN_ETH(dev);
memory_region_init_io(&s->reg_io, OBJECT(dev), &open_eth_reg_ops, s,
@@ -732,7 +732,6 @@ static int sysbus_open_eth_init(SysBusDevice *sbd)
s->nic = qemu_new_nic(&net_open_eth_info, &s->conf,
object_get_typename(OBJECT(s)), dev->id, s);
- return 0;
}
static void qdev_open_eth_reset(DeviceState *dev)
@@ -750,9 +749,8 @@ static Property open_eth_properties[] = {
static void open_eth_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = sysbus_open_eth_init;
+ dc->realize = sysbus_open_eth_realize;
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
dc->desc = "Opencores 10/100 Mbit Ethernet";
dc->reset = qdev_open_eth_reset;
--
2.17.1
- [Qemu-devel] [PATCH v2 01/11] net: etraxfs_eth: convert SysBus init method to a realize method, (continued)
- [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, 2018/10/01
- [Qemu-devel] [PATCH v2 07/11] net: opencores_eth: convert SysBus init method to a realize method,
Cédric Le Goater <=
- [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