[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 20/37] mips: use sysbus_mmio_get_region() instead of internal
From: |
Marc-André Lureau |
Subject: |
[PATCH v5 20/37] mips: use sysbus_mmio_get_region() instead of internal fields |
Date: |
Fri, 20 Dec 2019 17:45:44 +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>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <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 f0f81b34ec..36f70f16de 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -998,6 +998,7 @@ static void serial_io_realize(DeviceState *dev, Error
**errp)
}
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.308.g228f53135a
- [PATCH v5 10/37] serial: realize the serial device, (continued)
- [PATCH v5 10/37] serial: realize the serial device, Marc-André Lureau, 2019/12/20
- [PATCH v5 11/37] serial: replace serial_exit_core() with unrealize, Marc-André Lureau, 2019/12/20
- [PATCH v5 12/37] serial: start making SerialMM a sysbus device, Marc-André Lureau, 2019/12/20
- [PATCH v5 14/37] serial-mm: add endianness property, Marc-André Lureau, 2019/12/20
- [PATCH v5 15/37] serial-mm: use sysbus facilities, Marc-André Lureau, 2019/12/20
- [PATCH v5 16/37] serial: make SerialIO a sysbus device, Marc-André Lureau, 2019/12/20
- [PATCH v5 17/37] mips: inline serial_init(), Marc-André Lureau, 2019/12/20
- [PATCH v5 13/37] serial-mm: add "regshift" property, Marc-André Lureau, 2019/12/20
- [PATCH v5 18/37] mips: baudbase is 115200 by default, Marc-André Lureau, 2019/12/20
- [PATCH v5 19/37] mips: use sysbus_add_io(), Marc-André Lureau, 2019/12/20
- [PATCH v5 20/37] mips: use sysbus_mmio_get_region() instead of internal fields,
Marc-André Lureau <=
- [PATCH v5 21/37] sm501: make SerialMM a child, export chardev property, Marc-André Lureau, 2019/12/20
- [PATCH v5 22/37] vmmouse: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/12/20
- [PATCH v5 23/37] lance: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/12/20
- [PATCH v5 24/37] etraxfs: remove PROP_PTR usage, Marc-André Lureau, 2019/12/20
- [PATCH v5 25/37] dp8393x: replace PROP_PTR with PROP_LINK, Marc-André Lureau, 2019/12/20
- [PATCH v5 26/37] leon3: use qemu_irq framework instead of callback as property, Marc-André Lureau, 2019/12/20
- [PATCH v5 27/37] leon3: use qdev gpio facilities for the PIL, Marc-André Lureau, 2019/12/20
- [PATCH v5 28/37] qdev: use g_strcmp0() instead of open-coding it, Marc-André Lureau, 2019/12/20
- [PATCH v5 29/37] mips/cps: fix setting saar property, Marc-André Lureau, 2019/12/20
- [PATCH v5 30/37] cris: improve passing PIC interrupt vector to the CPU, Marc-André Lureau, 2019/12/20