Re: [PATCH v3 19/23] q800: move mac-nubus-bridge device to Q800MachineState

[Laurent Vivier]

Le 04/06/2023 à 15:14, Mark Cave-Ayland a écrit :
> Also change the instantiation of the mac-nubus-bridge device to use
> object_initialize_child() and map the Nubus address space using
> memory_region_add_subregion() instead of sysbus_mmio_map().
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>   hw/m68k/q800.c         | 21 ++++++++++++++-------
>   include/hw/m68k/q800.h |  2 ++
>   2 files changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index d6e19ff18c..14879310ca 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -415,14 +415,21 @@ static void q800_machine_init(MachineState *machine)
>   
>       /* NuBus */
>   
> -    dev = qdev_new(TYPE_MAC_NUBUS_BRIDGE);
> -    qdev_prop_set_uint32(dev, "slot-available-mask",
> +    object_initialize_child(OBJECT(machine), "mac-nubus-bridge",
> +                            &m->mac_nubus_bridge,
> +                            TYPE_MAC_NUBUS_BRIDGE);
> +    sysbus = SYS_BUS_DEVICE(&m->mac_nubus_bridge);
> +    dev = DEVICE(&m->mac_nubus_bridge);
> +    qdev_prop_set_uint32(DEVICE(&m->mac_nubus_bridge), "slot-available-mask",
>                            Q800_NUBUS_SLOTS_AVAILABLE);
> -    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
> -    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0,
> -                    MAC_NUBUS_FIRST_SLOT * NUBUS_SUPER_SLOT_SIZE);
> -    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE +
> -                    MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE);
> +    sysbus_realize(sysbus, &error_fatal);
> +    memory_region_add_subregion(get_system_memory(),
> +                                MAC_NUBUS_FIRST_SLOT * NUBUS_SUPER_SLOT_SIZE,
> +                                sysbus_mmio_get_region(sysbus, 0));
> +    memory_region_add_subregion(get_system_memory(),
> +                                NUBUS_SLOT_BASE +
> +                                MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE,
> +                                sysbus_mmio_get_region(sysbus, 1));

Why it's not done in PATCH 10?

Reviewed-by: Laurent Vivier <laurent@vivier.eu>