qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <huth@tuxfamily.org>
To: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 03/10] hw/m68k/mcf_intc: Expose MMIO region via SysBus API
Date: Thu,  2 Nov 2023 11:05:36 +0100	[thread overview]
Message-ID: <20231102100543.4875-4-huth@tuxfamily.org> (raw)
In-Reply-To: <20231102100543.4875-1-huth@tuxfamily.org>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

QOM objects shouldn't access each other internals fields
except using the QOM API.

Here the caller of mcf_intc_init() access the MMIO region from
the MCF_INTC state. Avoid that by exposing that region via
sysbus_init_mmio(), then get it with sysbus_mmio_get_region().

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Thomas Huth <huth@tuxfamily.org>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Message-ID: <20231024083010.12453-4-philmd@linaro.org>
Signed-off-by: Thomas Huth <huth@tuxfamily.org>
---
 hw/m68k/mcf_intc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/m68k/mcf_intc.c b/hw/m68k/mcf_intc.c
index 4cd30188c0..1f74ea0e14 100644
--- a/hw/m68k/mcf_intc.c
+++ b/hw/m68k/mcf_intc.c
@@ -173,6 +173,7 @@ static void mcf_intc_instance_init(Object *obj)
     mcf_intc_state *s = MCF_INTC(obj);
 
     memory_region_init_io(&s->iomem, obj, &mcf_intc_ops, s, "mcf", 0x100);
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->iomem);
 }
 
 static void mcf_intc_class_init(ObjectClass *oc, void *data)
@@ -211,7 +212,8 @@ qemu_irq *mcf_intc_init(MemoryRegion *sysmem,
     s = MCF_INTC(dev);
     s->cpu = cpu;
 
-    memory_region_add_subregion(sysmem, base, &s->iomem);
+    memory_region_add_subregion(sysmem, base,
+                                sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0));
 
     return qemu_allocate_irqs(mcf_intc_set_irq, s, 64);
 }
-- 
2.41.0



  parent reply	other threads:[~2023-11-02 10:08 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-02 10:05 [PULL 00/10] m68k patches Thomas Huth
2023-11-02 10:05 ` [PULL 01/10] hw/m68k/irqc: Pass CPU using QOM link property Thomas Huth
2023-11-02 10:05 ` [PULL 02/10] hw/m68k/mcf5206: " Thomas Huth
2023-11-02 10:05 ` Thomas Huth [this message]
2023-11-02 10:05 ` [PULL 04/10] hw/m68k/mcf_intc: " Thomas Huth
2023-11-02 10:05 ` [PULL 05/10] hw/m68k/next-cube: Do not open-code sysbus_create_simple() Thomas Huth
2023-11-02 10:05 ` [PULL 06/10] hw/m68k/virt: " Thomas Huth
2023-11-02 10:05 ` [PULL 07/10] hw/char/mcf_uart: Have mcf_uart_create() return DeviceState Thomas Huth
2023-11-02 10:05 ` [PULL 08/10] hw/m68k/next-cube: Mirror BIOS to address 0 Thomas Huth
2023-11-02 10:05 ` [PULL 09/10] m68k: Instantiate the ESP SCSI controller for the NeXTcube machine Thomas Huth
2023-11-02 10:05 ` [PULL 10/10] tests/avocado/machine_m68k_nextcube: Fix the download URL for the ROM image Thomas Huth
2023-11-03  1:31 ` [PULL 00/10] m68k patches Stefan Hajnoczi

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=20231102100543.4875-4-huth@tuxfamily.org \
    --to=huth@tuxfamily.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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).