diff options
| author | Cédric Le Goater <clg@kaod.org> | 2018-10-01 08:38:03 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-10-24 06:44:59 -0300 |
| commit | 8fa922c241e63f018f5b55c03ac494ae3d5fe594 (patch) | |
| tree | d41795f4db6cbcd6a8f13cbb53feaa1ba1ba15bb /hw/net | |
| parent | b11ff5ecf6961a637d17242eb3201d68cb94b282 (diff) | |
| download | qemu-8fa922c241e63f018f5b55c03ac494ae3d5fe594.zip qemu-8fa922c241e63f018f5b55c03ac494ae3d5fe594.tar.gz qemu-8fa922c241e63f018f5b55c03ac494ae3d5fe594.tar.bz2 | |
net: xgmac: convert SysBus init method to a realize method
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Cc: Rob Herring <robh@kernel.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-12-clg@kaod.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/xgmac.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index fa00156..63f5a62 100644 --- a/hw/net/xgmac.c +++ b/hw/net/xgmac.c @@ -374,9 +374,9 @@ static NetClientInfo net_xgmac_enet_info = { .receive = eth_rx, }; -static int xgmac_enet_init(SysBusDevice *sbd) +static void xgmac_enet_realize(DeviceState *dev, Error **errp) { - DeviceState *dev = DEVICE(sbd); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); XgmacState *s = XGMAC(dev); memory_region_init_io(&s->iomem, OBJECT(s), &enet_mem_ops, s, @@ -397,8 +397,6 @@ static int xgmac_enet_init(SysBusDevice *sbd) (s->conf.macaddr.a[2] << 16) | (s->conf.macaddr.a[1] << 8) | s->conf.macaddr.a[0]; - - return 0; } static Property xgmac_properties[] = { @@ -408,10 +406,9 @@ static Property xgmac_properties[] = { static void xgmac_enet_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sbc = SYS_BUS_DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); - sbc->init = xgmac_enet_init; + dc->realize = xgmac_enet_realize; dc->vmsd = &vmstate_xgmac; dc->props = xgmac_properties; } |