ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: stellaris_enet: convert SysBus init method to a realize method 

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20181001063803.22330-10-clg@kaod.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Cédric Le Goater 2018-10-01 08:38:01 +02:00 committed by Eduardo Habkost
parent f5ac82ce6c
commit bb4d585027
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/net/stellaris_enet.c
View File

@ -473,9 +473,9 @@ static NetClientInfo net_stellaris_enet_info = {
.receive = stellaris_enet_receive, .receive = stellaris_enet_receive,
}; };
static int stellaris_enet_init(SysBusDevice *sbd) static void stellaris_enet_realize(DeviceState *dev, Error **errp)
{ {
DeviceState *dev = DEVICE(sbd); SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
stellaris_enet_state *s = STELLARIS_ENET(dev); stellaris_enet_state *s = STELLARIS_ENET(dev);
memory_region_init_io(&s->mmio, OBJECT(s), &stellaris_enet_ops, s, memory_region_init_io(&s->mmio, OBJECT(s), &stellaris_enet_ops, s,
@ -489,7 +489,6 @@ static int stellaris_enet_init(SysBusDevice *sbd)
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
stellaris_enet_reset(s); stellaris_enet_reset(s);
return 0;
} }
static Property stellaris_enet_properties[] = { static Property stellaris_enet_properties[] = {
@ -500,9 +499,8 @@ static Property stellaris_enet_properties[] = {
static void stellaris_enet_class_init(ObjectClass *klass, void *data) static void stellaris_enet_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 = stellaris_enet_init; dc->realize = stellaris_enet_realize;
dc->props = stellaris_enet_properties; dc->props = stellaris_enet_properties;
dc->vmsd = &vmstate_stellaris_enet; dc->vmsd = &vmstate_stellaris_enet;
} }