[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/11] net: etraxfs_eth: convert SysBus init meth
From: |
Cédric Le Goater |
Subject: |
[Qemu-devel] [PATCH v2 01/11] net: etraxfs_eth: convert SysBus init method to a realize method |
Date: |
Mon, 1 Oct 2018 08:37:53 +0200 |
Cc: Edgar E. Iglesias <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
hw/net/etraxfs_eth.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c
index a6932432b164..64ab3df1ae38 100644
--- a/hw/net/etraxfs_eth.c
+++ b/hw/net/etraxfs_eth.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/cris/etraxfs.h"
@@ -584,14 +585,14 @@ static NetClientInfo net_etraxfs_info = {
.link_status_changed = eth_set_link,
};
-static int fs_eth_init(SysBusDevice *sbd)
+static void etraxfs_eth_realize(DeviceState *dev, Error **errp)
{
- DeviceState *dev = DEVICE(sbd);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
ETRAXFSEthState *s = ETRAX_FS_ETH(dev);
if (!s->dma_out || !s->dma_in) {
- error_report("Unconnected ETRAX-FS Ethernet MAC");
- return -1;
+ error_setg(errp, "Unconnected ETRAX-FS Ethernet MAC");
+ return;
}
s->dma_out->client.push = eth_tx_push;
@@ -611,7 +612,6 @@ static int fs_eth_init(SysBusDevice *sbd)
tdk_init(&s->phy);
mdio_attach(&s->mdio_bus, &s->phy, s->phyaddr);
- return 0;
}
static Property etraxfs_eth_properties[] = {
@@ -625,9 +625,8 @@ static Property etraxfs_eth_properties[] = {
static void etraxfs_eth_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = fs_eth_init;
+ dc->realize = etraxfs_eth_realize;
dc->props = etraxfs_eth_properties;
/* Reason: pointer properties "dma_out", "dma_in" */
dc->user_creatable = false;
--
2.17.1
- [Qemu-devel] [PATCH v2 00/11] net: convert SysBus init method to a realize method, Cédric Le Goater, 2018/10/01
- [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 <=
- [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, 2018/10/01