hw/sysbus.c: Remove unnecessary conditionals
Now that all sysbus MMIO regions are MemoryRegions, mmio[n].memory is never NULL, and we can remove some unnecessary conditionals. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
42ed372753
commit
e114fead27
10
hw/sysbus.c
10
hw/sysbus.c
|
@ -50,18 +50,13 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr)
|
|||
}
|
||||
if (dev->mmio[n].addr != (target_phys_addr_t)-1) {
|
||||
/* Unregister previous mapping. */
|
||||
if (dev->mmio[n].memory) {
|
||||
memory_region_del_subregion(get_system_memory(),
|
||||
dev->mmio[n].memory);
|
||||
}
|
||||
memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory);
|
||||
}
|
||||
dev->mmio[n].addr = addr;
|
||||
if (dev->mmio[n].memory) {
|
||||
memory_region_add_subregion(get_system_memory(),
|
||||
addr,
|
||||
dev->mmio[n].memory);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Request an IRQ source. The actual IRQ object may be populated later. */
|
||||
|
@ -206,10 +201,7 @@ static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent)
|
|||
|
||||
monitor_printf(mon, "%*sirq %d\n", indent, "", s->num_irq);
|
||||
for (i = 0; i < s->num_mmio; i++) {
|
||||
size = 0;
|
||||
if (s->mmio[i].memory) {
|
||||
size = memory_region_size(s->mmio[i].memory);
|
||||
}
|
||||
monitor_printf(mon, "%*smmio " TARGET_FMT_plx "/" TARGET_FMT_plx "\n",
|
||||
indent, "", s->mmio[i].addr, size);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue