Remove the sysbus_add_memory and sysbus_del_memory functions. These
are trivial wrappers for mapping a memory region into the system
memory space, and have no users now. Sysbus devices should never map
their own memory regions anyway; the correct API for mapping an mmio
region is for the creator of the device to use sysbus_mmio_map.
Signed-off-by: Peter Maydell peter.mayd...@linaro.org
---
hw/sysbus.c | 18 --
hw/sysbus.h |5 -
2 files changed, 23 deletions(-)
diff --git a/hw/sysbus.c b/hw/sysbus.c
index e9a16ac..980f31c 100644
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -217,24 +217,6 @@ static char *sysbus_get_fw_dev_path(DeviceState *dev)
return g_strdup(path);
}
-void sysbus_add_memory(SysBusDevice *dev, hwaddr addr,
- MemoryRegion *mem)
-{
-memory_region_add_subregion(get_system_memory(), addr, mem);
-}
-
-void sysbus_add_memory_overlap(SysBusDevice *dev, hwaddr addr,
- MemoryRegion *mem, unsigned priority)
-{
-memory_region_add_subregion_overlap(get_system_memory(), addr, mem,
-priority);
-}
-
-void sysbus_del_memory(SysBusDevice *dev, MemoryRegion *mem)
-{
-memory_region_del_subregion(get_system_memory(), mem);
-}
-
void sysbus_add_io(SysBusDevice *dev, hwaddr addr,
MemoryRegion *mem)
{
diff --git a/hw/sysbus.h b/hw/sysbus.h
index a7fcded..25c3ff2 100644
--- a/hw/sysbus.h
+++ b/hw/sysbus.h
@@ -56,11 +56,6 @@ void sysbus_init_ioports(SysBusDevice *dev, pio_addr_t
ioport, pio_addr_t size);
void sysbus_connect_irq(SysBusDevice *dev, int n, qemu_irq irq);
void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr);
-void sysbus_add_memory(SysBusDevice *dev, hwaddr addr,
- MemoryRegion *mem);
-void sysbus_add_memory_overlap(SysBusDevice *dev, hwaddr addr,
- MemoryRegion *mem, unsigned priority);
-void sysbus_del_memory(SysBusDevice *dev, MemoryRegion *mem);
void sysbus_add_io(SysBusDevice *dev, hwaddr addr,
MemoryRegion *mem);
void sysbus_del_io(SysBusDevice *dev, MemoryRegion *mem);
--
1.7.9.5
