[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 20/37] mips: use sysbus_mmio_get_region() instead of internal
From: |
Marc-André Lureau |
Subject: |
[PATCH v4 20/37] mips: use sysbus_mmio_get_region() instead of internal fields |
Date: |
Wed, 20 Nov 2019 19:24:25 +0400 |
Register the memory region with sysbus_init_mmio() and look it up with
sysbus_mmio_get_region() to avoid accessing internal device fields.
Suggested-by: Peter Maydell <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/char/serial.c | 1 +
hw/mips/mips_mipssim.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 23f0b02516..02c545ff8c 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -993,6 +993,7 @@ static void serial_io_realize(DeviceState *dev, Error
**errp)
qdev_init_nofail(DEVICE(s));
memory_region_init_io(&s->io, NULL, &serial_io_ops, s, "serial", 8);
+ sysbus_init_mmio(SYS_BUS_DEVICE(sio), &s->io);
sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq);
}
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 2c2c7f25b2..84c03dd035 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -227,7 +227,8 @@ mips_mipssim_init(MachineState *machine)
qdev_set_legacy_instance_id(dev, 0x3f8, 2);
qdev_init_nofail(dev);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, env->irq[4]);
- sysbus_add_io(SYS_BUS_DEVICE(dev), 0x3f8, &SERIAL_IO(dev)->serial.io);
+ sysbus_add_io(SYS_BUS_DEVICE(dev), 0x3f8,
+ sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0));
}
if (nd_table[0].used)
--
2.24.0
- Re: [PATCH v4 18/37] mips: baudbase is 115200 by default, (continued)
- Re: [PATCH v4 18/37] mips: baudbase is 115200 by default, Marc-André Lureau, 2019/11/25
- Re: [PATCH v4 18/37] mips: baudbase is 115200 by default, Philippe Mathieu-Daudé, 2019/11/25
- Re: [PATCH v4 18/37] mips: baudbase is 115200 by default, Aleksandar Markovic, 2019/11/25
- Re: [PATCH v4 18/37] mips: baudbase is 115200 by default, Philippe Mathieu-Daudé, 2019/11/25
- Re: [PATCH v4 18/37] mips: baudbase is 115200 by default, Philippe Mathieu-Daudé, 2019/11/25
- Re: [PATCH v4 18/37] mips: baudbase is 115200 by default, Marc-André Lureau, 2019/11/27
- Re: [PATCH v4 18/37] mips: baudbase is 115200 by default, Aleksandar Markovic, 2019/11/27
[PATCH v4 19/37] mips: use sysbus_add_io(), Marc-André Lureau, 2019/11/20
[PATCH v4 20/37] mips: use sysbus_mmio_get_region() instead of internal fields,
Marc-André Lureau <=
[PATCH v4 21/37] sm501: make SerialMM a child, export chardev property, Marc-André Lureau, 2019/11/20
[PATCH v4 22/37] vmmouse: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/11/20
[PATCH v4 23/37] lance: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/11/20
[PATCH v4 24/37] etraxfs: remove PROP_PTR usage, Marc-André Lureau, 2019/11/20
[PATCH v4 25/37] dp8393x: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/11/20