[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/24] q800: don't access Nubus bus directly from the mac-nubus-br
From: |
Laurent Vivier |
Subject: |
[PULL 21/24] q800: don't access Nubus bus directly from the mac-nubus-bridge device |
Date: |
Thu, 22 Jun 2023 09:55:41 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230621085353.113233-22-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
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 b22651931a22..a32e6fbf8dec 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -448,7 +448,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.40.1
- [PULL 00/24] Q800 for 8.1 patches, Laurent Vivier, 2023/06/22
- [PULL 01/24] q800: fix up minor spacing issues in hw_compat_q800 GlobalProperty array, Laurent Vivier, 2023/06/22
- [PULL 04/24] q800: rename q800_init() to q800_machine_init(), Laurent Vivier, 2023/06/22
- [PULL 12/24] q800: move VIA1 device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 03/24] q800: introduce Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 02/24] q800: add missing space after parent object in GLUEState, Laurent Vivier, 2023/06/22
- [PULL 10/24] q800: introduce mac-io container memory region, Laurent Vivier, 2023/06/22
- [PULL 17/24] q800: move escc_orgate device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 14/24] hw/net/dp8393x.c: move TYPE_DP8393X and dp8393xState into dp8393x.h, Laurent Vivier, 2023/06/22
- [PULL 21/24] q800: don't access Nubus bus directly from the mac-nubus-bridge device,
Laurent Vivier <=
- [PULL 15/24] q800: move dp8393x device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 09/24] q800: move GLUE device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 23/24] mac_via: fix rtc command decoding from PRAM addresses 0x0 to 0xf, Laurent Vivier, 2023/06/22
- [PULL 24/24] mac_via: fix rtc command decoding for the PRAM seconds registers, Laurent Vivier, 2023/06/22
- [PULL 08/24] q800-glue.c: switch TypeInfo registration to use DEFINE_TYPES() macro, Laurent Vivier, 2023/06/22
- [PULL 11/24] q800: reimplement mac-io region aliasing using IO memory region, Laurent Vivier, 2023/06/22
- [PULL 06/24] q800: move ROM memory region to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 13/24] q800: move VIA2 device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 16/24] q800: move ESCC device to Q800MachineState, Laurent Vivier, 2023/06/22
- [PULL 07/24] q800: move GLUE device into separate q800-glue.c file, Laurent Vivier, 2023/06/22