net: etraxfs_eth: convert SysBus init method to a realize method
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com> Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20181001063803.22330-2-clg@kaod.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
005feccf62
commit
c24828bb95
|
@ -23,6 +23,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
|
#include "qapi/error.h"
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
#include "net/net.h"
|
#include "net/net.h"
|
||||||
#include "hw/cris/etraxfs.h"
|
#include "hw/cris/etraxfs.h"
|
||||||
|
@ -584,14 +585,14 @@ static NetClientInfo net_etraxfs_info = {
|
||||||
.link_status_changed = eth_set_link,
|
.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);
|
ETRAXFSEthState *s = ETRAX_FS_ETH(dev);
|
||||||
|
|
||||||
if (!s->dma_out || !s->dma_in) {
|
if (!s->dma_out || !s->dma_in) {
|
||||||
error_report("Unconnected ETRAX-FS Ethernet MAC");
|
error_setg(errp, "Unconnected ETRAX-FS Ethernet MAC");
|
||||||
return -1;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
s->dma_out->client.push = eth_tx_push;
|
s->dma_out->client.push = eth_tx_push;
|
||||||
|
@ -611,7 +612,6 @@ static int fs_eth_init(SysBusDevice *sbd)
|
||||||
|
|
||||||
tdk_init(&s->phy);
|
tdk_init(&s->phy);
|
||||||
mdio_attach(&s->mdio_bus, &s->phy, s->phyaddr);
|
mdio_attach(&s->mdio_bus, &s->phy, s->phyaddr);
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Property etraxfs_eth_properties[] = {
|
static Property etraxfs_eth_properties[] = {
|
||||||
|
@ -625,9 +625,8 @@ static Property etraxfs_eth_properties[] = {
|
||||||
static void etraxfs_eth_class_init(ObjectClass *klass, void *data)
|
static void etraxfs_eth_class_init(ObjectClass *klass, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
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;
|
dc->props = etraxfs_eth_properties;
|
||||||
/* Reason: pointer properties "dma_out", "dma_in" */
|
/* Reason: pointer properties "dma_out", "dma_in" */
|
||||||
dc->user_creatable = false;
|
dc->user_creatable = false;
|
||||||
|
|
Loading…
Reference in a new issue