On Thu, Oct 18, 2018 at 05:04:14PM -0300, Eduardo Habkost wrote: > From: Cédric Le Goater <c...@kaod.org> > > 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-5-...@kaod.org> > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> hw/net/lance.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/hw/net/lance.c b/hw/net/lance.c
> index a08d5ac6a8..f987b2fd18 100644
> --- a/hw/net/lance.c
> +++ b/hw/net/lance.c
> @@ -97,9 +97,9 @@ static const VMStateDescription vmstate_lance = {
> }
> };
>
> -static int lance_init(SysBusDevice *sbd)
> +static void lance_realize(DeviceState *dev, Error **errp)
> {
> - DeviceState *dev = DEVICE(sbd);
> + SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> SysBusPCNetState *d = SYSBUS_PCNET(dev);
> PCNetState *s = &d->state;
>
> @@ -115,7 +115,6 @@ static int lance_init(SysBusDevice *sbd)
> s->phys_mem_read = ledma_memory_read;
> s->phys_mem_write = ledma_memory_write;
> pcnet_common_init(dev, s, &net_lance_info);
> - return 0;
> }
>
> static void lance_reset(DeviceState *dev)
> @@ -144,9 +143,8 @@ static Property lance_properties[] = {
> static void lance_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> - k->init = lance_init;
> + dc->realize = lance_realize;
> set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
> dc->fw_name = "ethernet";
> dc->reset = lance_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
