[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/10] hw/m68k/mcf_intc: Expose MMIO region via SysBus API
|
From: |
Thomas Huth |
|
Subject: |
[PULL 03/10] hw/m68k/mcf_intc: Expose MMIO region via SysBus API |
|
Date: |
Thu, 2 Nov 2023 11:05:36 +0100 |
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
- [PULL 00/10] m68k patches, Thomas Huth, 2023/11/02
- [PULL 01/10] hw/m68k/irqc: Pass CPU using QOM link property, Thomas Huth, 2023/11/02
- [PULL 02/10] hw/m68k/mcf5206: Pass CPU using QOM link property, Thomas Huth, 2023/11/02
- [PULL 03/10] hw/m68k/mcf_intc: Expose MMIO region via SysBus API,
Thomas Huth <=
- [PULL 04/10] hw/m68k/mcf_intc: Pass CPU using QOM link property, Thomas Huth, 2023/11/02
- [PULL 05/10] hw/m68k/next-cube: Do not open-code sysbus_create_simple(), Thomas Huth, 2023/11/02
- [PULL 08/10] hw/m68k/next-cube: Mirror BIOS to address 0, Thomas Huth, 2023/11/02
- [PULL 06/10] hw/m68k/virt: Do not open-code sysbus_create_simple(), Thomas Huth, 2023/11/02
- [PULL 07/10] hw/char/mcf_uart: Have mcf_uart_create() return DeviceState, Thomas Huth, 2023/11/02
- [PULL 09/10] m68k: Instantiate the ESP SCSI controller for the NeXTcube machine, Thomas Huth, 2023/11/02
- [PULL 10/10] tests/avocado/machine_m68k_nextcube: Fix the download URL for the ROM image, Thomas Huth, 2023/11/02
- Re: [PULL 00/10] m68k patches, Stefan Hajnoczi, 2023/11/02