| Message ID | 20180928135003.8650-12-clg@kaod.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: convert SysBus init method to a realize method | expand |
On 28 September 2018 at 14:50, Cédric Le Goater <clg@kaod.org> wrote: > 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> > --- > hw/net/xgmac.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On 28/09/2018 15:50, Cédric Le Goater wrote: > 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: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/net/xgmac.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c > index fa001563d3de..63f5a62ebf1b 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; > } >
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c index fa001563d3de..63f5a62ebf1b 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; }
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> --- hw/net/xgmac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)