In order to make the next commit easier to review, use the local @mr variable in sysbus_mmio_map_common().
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- hw/core/sysbus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 414b3f806d1..dca6e67a92d 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -122,7 +122,10 @@ bool sysbus_has_mmio(const SysBusDevice *dev, unsigned int n) static void sysbus_mmio_map_common(SysBusDevice *dev, int n, hwaddr addr, bool may_overlap, int priority) { + MemoryRegion *mr; + assert(n >= 0 && n < dev->num_mmio); + mr = dev->mmio[n].memory; if (dev->mmio[n].addr == addr) { /* ??? region already mapped here. */ @@ -130,13 +133,13 @@ static void sysbus_mmio_map_common(SysBusDevice *dev, int n, hwaddr addr, } if (dev->mmio[n].addr != (hwaddr)-1) { /* Unregister previous mapping. */ - memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory); + memory_region_del_subregion(get_system_memory(), mr); } dev->mmio[n].addr = addr; if (may_overlap) { memory_region_add_subregion_overlap(get_system_memory(), addr, - dev->mmio[n].memory, + mr, priority); } else { -- 2.51.0
