[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/20] nubus: implement BusClass get_dev_path()
From: |
Laurent Vivier |
Subject: |
[PULL 06/20] nubus: implement BusClass get_dev_path() |
Date: |
Wed, 29 Sep 2021 11:28:29 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210924073808.1041-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/nubus/nubus-bus.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/hw/nubus/nubus-bus.c b/hw/nubus/nubus-bus.c
index 96ef027bad26..04f11edd2465 100644
--- a/hw/nubus/nubus-bus.c
+++ b/hw/nubus/nubus-bus.c
@@ -96,6 +96,21 @@ static void nubus_init(Object *obj)
NUBUS_SLOT_NB);
}
+static char *nubus_get_dev_path(DeviceState *dev)
+{
+ NubusDevice *nd = NUBUS_DEVICE(dev);
+ BusState *bus = qdev_get_parent_bus(dev);
+ char *p = qdev_get_dev_path(bus->parent);
+
+ if (p) {
+ char *ret = g_strdup_printf("%s/%s/%02x", p, bus->name, nd->slot);
+ g_free(p);
+ return ret;
+ } else {
+ return g_strdup_printf("%s/%02x", bus->name, nd->slot);
+ }
+}
+
static bool nubus_check_address(BusState *bus, DeviceState *dev, Error **errp)
{
NubusDevice *nd = NUBUS_DEVICE(dev);
@@ -130,6 +145,7 @@ static void nubus_class_init(ObjectClass *oc, void *data)
bc->realize = nubus_realize;
bc->check_address = nubus_check_address;
+ bc->get_dev_path = nubus_get_dev_path;
}
static const TypeInfo nubus_bus_info = {
--
2.31.1
- [PULL 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address(), (continued)
- [PULL 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address(), Laurent Vivier, 2021/09/29
- [PULL 09/20] macfb: don't register declaration ROM, Laurent Vivier, 2021/09/29
- [PULL 04/20] nubus: use bitmap to manage available slots, Laurent Vivier, 2021/09/29
- [PULL 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), Laurent Vivier, 2021/09/29
- [PULL 11/20] nubus-device: add romfile property for loading declaration ROMs, Laurent Vivier, 2021/09/29
- [PULL 12/20] nubus: move nubus to its own 32-bit address space, Laurent Vivier, 2021/09/29
- [PULL 02/20] nubus-device: rename slot_nb variable to slot, Laurent Vivier, 2021/09/29
- [PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge, Laurent Vivier, 2021/09/29
- [PULL 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge, Laurent Vivier, 2021/09/29
- [PULL 03/20] nubus-device: expose separate super slot memory region, Laurent Vivier, 2021/09/29
- [PULL 06/20] nubus: implement BusClass get_dev_path(),
Laurent Vivier <=
- [PULL 18/20] nubus: add support for slot IRQs, Laurent Vivier, 2021/09/29
- [PULL 07/20] nubus: add trace-events for empty slot accesses, Laurent Vivier, 2021/09/29
- [PULL 08/20] nubus: generate bus error when attempting to access empty slots, Laurent Vivier, 2021/09/29
- [PULL 20/20] q800: configure nubus available slots for Quadra 800, Laurent Vivier, 2021/09/29
- [PULL 13/20] nubus-bridge: introduce separate NubusBridge structure, Laurent Vivier, 2021/09/29
- [PULL 19/20] q800: wire up nubus IRQs, Laurent Vivier, 2021/09/29
- [PULL 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge, Laurent Vivier, 2021/09/29
- [PULL 17/20] nubus-bridge: make slot_available_mask a qdev property, Laurent Vivier, 2021/09/29
- Re: [PULL 00/20] Q800 for 6.2 patches, Peter Maydell, 2021/09/30