qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 06/20] nubus: implement BusClass get_dev_path()
Date: Wed, 29 Sep 2021 11:28:29 +0200	[thread overview]
Message-ID: <20210929092843.2686234-7-laurent@vivier.eu> (raw)
In-Reply-To: <20210929092843.2686234-1-laurent@vivier.eu>

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



  parent reply	other threads:[~2021-09-29  9:51 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-29  9:28 [PULL 00/20] Q800 for 6.2 patches Laurent Vivier
2021-09-29  9:28 ` [PULL 01/20] nubus: add comment indicating reference documents Laurent Vivier
2021-09-29  9:28 ` [PULL 02/20] nubus-device: rename slot_nb variable to slot Laurent Vivier
2021-09-29  9:28 ` [PULL 03/20] nubus-device: expose separate super slot memory region Laurent Vivier
2021-10-02 10:33   ` Peter Maydell
2021-10-04  7:01     ` Laurent Vivier
2021-10-04 10:16       ` BALATON Zoltan
2021-09-29  9:28 ` [PULL 04/20] nubus: use bitmap to manage available slots Laurent Vivier
2021-09-29  9:28 ` [PULL 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address() Laurent Vivier
2021-09-29  9:28 ` Laurent Vivier [this message]
2021-09-29  9:28 ` [PULL 07/20] nubus: add trace-events for empty slot accesses Laurent Vivier
2021-09-29  9:28 ` [PULL 08/20] nubus: generate bus error when attempting to access empty slots Laurent Vivier
2021-09-29  9:28 ` [PULL 09/20] macfb: don't register declaration ROM Laurent Vivier
2021-09-29  9:28 ` [PULL 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block() Laurent Vivier
2021-09-29  9:28 ` [PULL 11/20] nubus-device: add romfile property for loading declaration ROMs Laurent Vivier
2021-10-02 10:30   ` Peter Maydell
2021-09-29  9:28 ` [PULL 12/20] nubus: move nubus to its own 32-bit address space Laurent Vivier
2021-09-29  9:28 ` [PULL 13/20] nubus-bridge: introduce separate NubusBridge structure Laurent Vivier
2021-09-29  9:28 ` [PULL 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge Laurent Vivier
2021-09-29  9:28 ` [PULL 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge Laurent Vivier
2021-09-29  9:28 ` [PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge Laurent Vivier
2021-09-29  9:28 ` [PULL 17/20] nubus-bridge: make slot_available_mask a qdev property Laurent Vivier
2021-09-29  9:28 ` [PULL 18/20] nubus: add support for slot IRQs Laurent Vivier
2021-09-29  9:28 ` [PULL 19/20] q800: wire up nubus IRQs Laurent Vivier
2021-09-29  9:28 ` [PULL 20/20] q800: configure nubus available slots for Quadra 800 Laurent Vivier
2021-09-30 10:27 ` [PULL 00/20] Q800 for 6.2 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210929092843.2686234-7-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=f4bug@amsat.org \
    --cc=mark.cave-ayland@ilande.co.uk \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).