On Thu, Oct 18, 2018 at 05:04:15PM -0300, Eduardo Habkost wrote:
> From: Cédric Le Goater <clg@xxxxxxxx>
>
> Cc: Michael Walle <michael@xxxxxxxx>
> Signed-off-by: Cédric Le Goater <clg@xxxxxxxx>
> Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
> Message-Id: <20181001063803.22330-6-clg@xxxxxxxx>
> Acked-by: Michael Walle <michael@xxxxxxxx>
> Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
Reviewed-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
> ---
> hw/net/milkymist-minimac2.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
> index 3eaa19dfde..7ef1daee41 100644
> --- a/hw/net/milkymist-minimac2.c
> +++ b/hw/net/milkymist-minimac2.c
> @@ -452,9 +452,9 @@ static NetClientInfo net_milkymist_minimac2_info = {
> .receive = minimac2_rx,
> };
>
> -static int milkymist_minimac2_init(SysBusDevice *sbd)
> +static void milkymist_minimac2_realize(DeviceState *dev, Error **errp)
> {
> - DeviceState *dev = DEVICE(sbd);
> + SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> MilkymistMinimac2State *s = MILKYMIST_MINIMAC2(dev);
> size_t buffers_size = TARGET_PAGE_ALIGN(3 * MINIMAC2_BUFFER_SIZE);
>
> @@ -479,8 +479,6 @@ static int milkymist_minimac2_init(SysBusDevice *sbd)
> s->nic = qemu_new_nic(&net_milkymist_minimac2_info, &s->conf,
> object_get_typename(OBJECT(dev)), dev->id, s);
> qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
> -
> - return 0;
> }
>
> static const VMStateDescription vmstate_milkymist_minimac2_mdio = {
> @@ -521,9 +519,8 @@ static Property milkymist_minimac2_properties[] = {
> static void milkymist_minimac2_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> - k->init = milkymist_minimac2_init;
> + dc->realize = milkymist_minimac2_realize;
> dc->reset = milkymist_minimac2_reset;
> dc->vmsd = &vmstate_milkymist_minimac2;
> dc->props = milkymist_minimac2_properties;
--
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
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
