qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: qemu-devel@nongnu.org, laurent@vivier.eu
Subject: [PATCH v5 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge
Date: Thu, 23 Sep 2021 10:13:02 +0100	[thread overview]
Message-ID: <20210923091308.13832-15-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20210923091308.13832-1-mark.cave-ayland@ilande.co.uk>

This better reflects that the mac-nubus-bridge device is derived from the
nubus-bridge device, and that the structure represents the state of the bridge
device and not the Nubus itself. Also update the comment in the file header to
reflect that mac-nubus-bridge is specific to the Macintosh.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/nubus/mac-nubus-bridge.c         | 8 +++++---
 include/hw/nubus/mac-nubus-bridge.h | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hw/nubus/mac-nubus-bridge.c b/hw/nubus/mac-nubus-bridge.c
index 3af4f5d396..e241c581b5 100644
--- a/hw/nubus/mac-nubus-bridge.c
+++ b/hw/nubus/mac-nubus-bridge.c
@@ -1,5 +1,7 @@
 /*
- *  Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu>
+ * QEMU Macintosh Nubus
+ *
+ * Copyright (c) 2013-2018 Laurent Vivier <laurent@vivier.eu>
  *
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
@@ -13,7 +15,7 @@
 
 static void mac_nubus_bridge_init(Object *obj)
 {
-    MacNubusState *s = MAC_NUBUS_BRIDGE(obj);
+    MacNubusBridge *s = MAC_NUBUS_BRIDGE(obj);
     SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
 
     s->bus = NUBUS_BUS(qbus_create(TYPE_NUBUS_BUS, DEVICE(s), NULL));
@@ -49,7 +51,7 @@ static const TypeInfo mac_nubus_bridge_info = {
     .name          = TYPE_MAC_NUBUS_BRIDGE,
     .parent        = TYPE_NUBUS_BRIDGE,
     .instance_init = mac_nubus_bridge_init,
-    .instance_size = sizeof(MacNubusState),
+    .instance_size = sizeof(MacNubusBridge),
     .class_init    = mac_nubus_bridge_class_init,
 };
 
diff --git a/include/hw/nubus/mac-nubus-bridge.h b/include/hw/nubus/mac-nubus-bridge.h
index fa454f5fbe..b595e1b7ef 100644
--- a/include/hw/nubus/mac-nubus-bridge.h
+++ b/include/hw/nubus/mac-nubus-bridge.h
@@ -17,9 +17,9 @@
 #define MAC_NUBUS_SLOT_NB    (MAC_NUBUS_LAST_SLOT - MAC_NUBUS_FIRST_SLOT + 1)
 
 #define TYPE_MAC_NUBUS_BRIDGE "mac-nubus-bridge"
-OBJECT_DECLARE_SIMPLE_TYPE(MacNubusState, MAC_NUBUS_BRIDGE)
+OBJECT_DECLARE_SIMPLE_TYPE(MacNubusBridge, MAC_NUBUS_BRIDGE)
 
-struct MacNubusState {
+struct MacNubusBridge {
     NubusBridge parent_obj;
 
     NubusBus *bus;
-- 
2.20.1



  parent reply	other threads:[~2021-09-23  9:28 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-23  9:12 [PATCH v5 00/20] nubus: bus, device, bridge, IRQ and address space improvements Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 01/20] nubus: add comment indicating reference documents Mark Cave-Ayland
2021-09-23  9:35   ` Philippe Mathieu-Daudé
2021-09-23 10:01   ` Laurent Vivier
2021-09-23  9:12 ` [PATCH v5 02/20] nubus-device: rename slot_nb variable to slot Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 03/20] nubus-device: expose separate super slot memory region Mark Cave-Ayland
2021-09-23 10:04   ` Laurent Vivier
2021-09-23  9:12 ` [PATCH v5 04/20] nubus: use bitmap to manage available slots Mark Cave-Ayland
2021-09-23  9:42   ` Philippe Mathieu-Daudé
2021-09-24  7:00     ` Mark Cave-Ayland
2021-09-23 10:28   ` Laurent Vivier
2021-09-23 14:16   ` BALATON Zoltan
2021-09-24  7:16     ` Mark Cave-Ayland
2021-09-24  8:50       ` Philippe Mathieu-Daudé
2021-09-24 10:51         ` BALATON Zoltan
2021-09-23  9:12 ` [PATCH v5 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address() Mark Cave-Ayland
2021-09-23  9:45   ` Philippe Mathieu-Daudé
2021-09-24  7:01     ` Mark Cave-Ayland
2021-09-23 10:30   ` Laurent Vivier
2021-09-23  9:12 ` [PATCH v5 06/20] nubus: implement BusClass get_dev_path() Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 07/20] nubus: add trace-events for empty slot accesses Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 08/20] nubus: generate bus error when attempting to access empty slots Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 09/20] macfb: don't register declaration ROM Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block() Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 11/20] nubus-device: add romfile property for loading declaration ROMs Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 12/20] nubus: move nubus to its own 32-bit address space Mark Cave-Ayland
2021-09-23 10:33   ` Laurent Vivier
2021-09-23  9:13 ` [PATCH v5 13/20] nubus-bridge: introduce separate NubusBridge structure Mark Cave-Ayland
2021-09-23 10:35   ` Laurent Vivier
2021-09-23  9:13 ` Mark Cave-Ayland [this message]
2021-09-23 10:35   ` [PATCH v5 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge Laurent Vivier
2021-09-23 12:50     ` Mark Cave-Ayland
2021-09-23 13:53       ` Laurent Vivier
2021-09-23 16:03         ` Mark Cave-Ayland
2021-09-24  6:37           ` Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge Mark Cave-Ayland
2021-09-23 10:36   ` Laurent Vivier
2021-09-23  9:13 ` [PATCH v5 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge Mark Cave-Ayland
2021-09-23 10:37   ` Laurent Vivier
2021-09-23  9:13 ` [PATCH v5 17/20] nubus-bridge: make slot_available_mask a qdev property Mark Cave-Ayland
2021-09-23  9:52   ` Philippe Mathieu-Daudé
2021-09-24  7:09     ` Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 18/20] nubus: add support for slot IRQs Mark Cave-Ayland
2021-09-23  9:49   ` Philippe Mathieu-Daudé
2021-09-24  7:06     ` Mark Cave-Ayland
2021-09-24  9:01       ` Philippe Mathieu-Daudé
2021-09-24  9:05         ` Philippe Mathieu-Daudé
2021-09-29  6:42           ` Mark Cave-Ayland
2021-09-29  8:38             ` Laurent Vivier
2021-09-24  9:43         ` Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 19/20] q800: wire up nubus IRQs Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 20/20] q800: configure nubus available slots for Quadra 800 Mark Cave-Ayland

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=20210923091308.13832-15-mark.cave-ayland@ilande.co.uk \
    --to=mark.cave-ayland@ilande.co.uk \
    --cc=laurent@vivier.eu \
    --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).