All of lore.kernel.org
 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 02/20] nubus-device: rename slot_nb variable to slot
Date: Thu, 23 Sep 2021 10:12:50 +0100	[thread overview]
Message-ID: <20210923091308.13832-3-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20210923091308.13832-1-mark.cave-ayland@ilande.co.uk>

This is in preparation for creating a qdev property of the same name.

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>
---
 hw/nubus/nubus-device.c  | 14 +++++++-------
 include/hw/nubus/nubus.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index ffe78a8823..be01269563 100644
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -87,7 +87,7 @@ static void nubus_register_format_block(NubusDevice *dev)
     char *fblock_name;
 
     fblock_name = g_strdup_printf("nubus-slot-%d-format-block",
-                                  dev->slot_nb);
+                                  dev->slot);
 
     hwaddr fblock_offset = memory_region_size(&dev->slot_mem) - FBLOCK_SIZE;
     memory_region_init_io(&dev->fblock_io, NULL, &nubus_format_block_ops,
@@ -142,7 +142,7 @@ void nubus_register_rom(NubusDevice *dev, const uint8_t *rom, uint32_t size,
     /* ROM */
 
     dev->rom = rom;
-    rom_name = g_strdup_printf("nubus-slot-%d-rom", dev->slot_nb);
+    rom_name = g_strdup_printf("nubus-slot-%d-rom", dev->slot);
     memory_region_init_io(&dev->rom_io, NULL, &mac_nubus_rom_ops,
                           dev, rom_name, size);
     memory_region_set_readonly(&dev->rom_io, true);
@@ -167,12 +167,12 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
         return;
     }
 
-    nd->slot_nb = nubus->current_slot++;
-    name = g_strdup_printf("nubus-slot-%d", nd->slot_nb);
+    nd->slot = nubus->current_slot++;
+    name = g_strdup_printf("nubus-slot-%d", nd->slot);
 
-    if (nd->slot_nb < NUBUS_FIRST_SLOT) {
+    if (nd->slot < NUBUS_FIRST_SLOT) {
         /* Super */
-        slot_offset = (nd->slot_nb - 6) * NUBUS_SUPER_SLOT_SIZE;
+        slot_offset = (nd->slot - 6) * NUBUS_SUPER_SLOT_SIZE;
 
         memory_region_init(&nd->slot_mem, OBJECT(dev), name,
                            NUBUS_SUPER_SLOT_SIZE);
@@ -180,7 +180,7 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
                                     &nd->slot_mem);
     } else {
         /* Normal */
-        slot_offset = nd->slot_nb * NUBUS_SLOT_SIZE;
+        slot_offset = nd->slot * NUBUS_SLOT_SIZE;
 
         memory_region_init(&nd->slot_mem, OBJECT(dev), name, NUBUS_SLOT_SIZE);
         memory_region_add_subregion(&nubus->slot_io, slot_offset,
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index e2b5cf260b..424309dd73 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -42,7 +42,7 @@ struct NubusBus {
 struct NubusDevice {
     DeviceState qdev;
 
-    int slot_nb;
+    int slot;
     MemoryRegion slot_mem;
 
     /* Format Block */
-- 
2.20.1



  parent reply	other threads:[~2021-09-23  9:20 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 ` Mark Cave-Ayland [this message]
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 ` [PATCH v5 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge Mark Cave-Ayland
2021-09-23 10:35   ` 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-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.