[v2] q800: add support for booting MacOS Classic - part 1

[PATCH v2 20/23] q800: don't access Nubus bus directly from the mac-nubus-bridge device

Posted by Mark Cave-Ayland 2 years, 8 months ago

Instead use the qdev_get_child_bus() function which is intended for this exact
purpose.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/m68k/q800.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index d02a1a7a1f..946cb09e30 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -445,7 +445,7 @@ static void q800_machine_init(MachineState *machine)
                           qdev_get_gpio_in_named(DEVICE(&m->via2), "nubus-irq",
                                                  VIA2_NUBUS_IRQ_9));
 
-    nubus = &NUBUS_BRIDGE(dev)->bus;
+    nubus = NUBUS_BUS(qdev_get_child_bus(dev, "nubus-bus.0"));
 
     /* framebuffer in nubus slot #9 */
 
-- 
2.30.2

Re: [PATCH v2 20/23] q800: don't access Nubus bus directly from the mac-nubus-bridge device

Posted by Laurent Vivier 2 years, 8 months ago

Le 31/05/2023 à 14:53, Mark Cave-Ayland a écrit :
> Instead use the qdev_get_child_bus() function which is intended for this exact
> purpose.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>   hw/m68k/q800.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index d02a1a7a1f..946cb09e30 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -445,7 +445,7 @@ static void q800_machine_init(MachineState *machine)
>                             qdev_get_gpio_in_named(DEVICE(&m->via2), "nubus-irq",
>                                                    VIA2_NUBUS_IRQ_9));
>   
> -    nubus = &NUBUS_BRIDGE(dev)->bus;
> +    nubus = NUBUS_BUS(qdev_get_child_bus(dev, "nubus-bus.0"));
>   
>       /* framebuffer in nubus slot #9 */
>   

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