On Thu, Oct 18, 2018 at 05:04:17PM -0300, Eduardo Habkost wrote: > From: Cédric Le Goater <c...@kaod.org> > > Cc: Max Filippov <jcmvb...@gmail.com> > Signed-off-by: Cédric Le Goater <c...@kaod.org> > Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> > Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > Message-Id: <20181001063803.22330-8-...@kaod.org> > Acked-by: Max Filippov <jcmvb...@gmail.com> > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> hw/net/opencores_eth.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/hw/net/opencores_eth.c b/hw/net/opencores_eth.c
> index d42b79c08c..d6f54f8d82 100644
> --- a/hw/net/opencores_eth.c
> +++ b/hw/net/opencores_eth.c
> @@ -715,9 +715,9 @@ static const MemoryRegionOps open_eth_desc_ops = {
> .write = open_eth_desc_write,
> };
>
> -static int sysbus_open_eth_init(SysBusDevice *sbd)
> +static void sysbus_open_eth_realize(DeviceState *dev, Error **errp)
> {
> - DeviceState *dev = DEVICE(sbd);
> + SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> OpenEthState *s = OPEN_ETH(dev);
>
> memory_region_init_io(&s->reg_io, OBJECT(dev), &open_eth_reg_ops, s,
> @@ -732,7 +732,6 @@ static int sysbus_open_eth_init(SysBusDevice *sbd)
>
> s->nic = qemu_new_nic(&net_open_eth_info, &s->conf,
> object_get_typename(OBJECT(s)), dev->id, s);
> - return 0;
> }
>
> static void qdev_open_eth_reset(DeviceState *dev)
> @@ -750,9 +749,8 @@ static Property open_eth_properties[] = {
> static void open_eth_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> - k->init = sysbus_open_eth_init;
> + dc->realize = sysbus_open_eth_realize;
> set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
> dc->desc = "Opencores 10/100 Mbit Ethernet";
> dc->reset = qdev_open_eth_reset;
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
