Re: [PULL 16/84] macio: Put "macio-nvram" device on the macio bus

[BALATON Zoltan]

On Mon, 15 Jun 2020, Markus Armbruster wrote:
> macio_oldworld_init() creates a "macio-nvram", sysbus device, but
> neglects to but it on a bus.

This letter   ^ is upside down :-) (but -> put).

Regards,
BALATON Zoltan

> Put it on the macio bus.  Affects machine g3beige.  Visible in "info
> qtree":
>
>             bus: macio.0
>               type macio-bus
>               [...]
>    +          dev: macio-nvram, id ""
>    +            size = 8192 (0x2000)
>    +            it_shift = 4 (0x4)
>
> This also makes it a QOM child of macio-oldworld.  Visible in "info
> qom-tree":
>
>     /machine (g3beige-machine)
>       [...]
>       /unattached (container)
>         [...]
>         /device[6] (macio-oldworld)
>           [...]
>    -    /device[7] (macio-nvram)
>    -      /macio-nvram[0] (qemu:memory-region)
>    +      /nvram (macio-nvram)
>    +        /macio-nvram[0] (qemu:memory-region)
>         [rest of device[*] renumbered...]
>
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Cc: qemu-ppc@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Message-Id: <20200609122339.937862-15-armbru@redhat.com>
> ---
> hw/misc/macio/macio.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index b3dddf8be7..ebc96cc8f6 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -245,7 +245,8 @@ static void macio_oldworld_init(Object *obj)
>
>     macio_init_child_obj(s, "cuda", &s->cuda, sizeof(s->cuda), TYPE_CUDA);
>
> -    object_initialize(&os->nvram, sizeof(os->nvram), TYPE_MACIO_NVRAM);
> +    macio_init_child_obj(s, "nvram", &os->nvram, sizeof(os->nvram),
> +                         TYPE_MACIO_NVRAM);
>     dev = DEVICE(&os->nvram);
>     qdev_prop_set_uint32(dev, "size", 0x2000);
>     qdev_prop_set_uint32(dev, "it_shift", 4);