We can reuse memory_region_init_io in memory_region_init_rom_device. Also shorten some other function prototypes.
Signed-off-by: BALATON Zoltan <[email protected]> --- system/memory.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/system/memory.c b/system/memory.c index c3465d7ffe..74179463ea 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1568,12 +1568,9 @@ static void memory_region_set_ops(MemoryRegion *mr, mr->terminates = true; } -void memory_region_init_io(MemoryRegion *mr, - Object *owner, - const MemoryRegionOps *ops, - void *opaque, - const char *name, - uint64_t size) +void memory_region_init_io(MemoryRegion *mr, Object *owner, + const MemoryRegionOps *ops, void *opaque, + const char *name, uint64_t size) { memory_region_init(mr, owner, name, size); memory_region_set_ops(mr, ops, opaque); @@ -1684,12 +1681,9 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, Object *owner, mr->ram_device = true; } -void memory_region_init_alias(MemoryRegion *mr, - Object *owner, - const char *name, - MemoryRegion *orig, - hwaddr offset, - uint64_t size) +void memory_region_init_alias(MemoryRegion *mr, Object *owner, + const char *name, MemoryRegion *orig, + hwaddr offset, uint64_t size) { memory_region_init(mr, owner, name, size); mr->alias = orig; @@ -3704,8 +3698,7 @@ bool memory_region_init_rom_device(MemoryRegion *mr, Object *owner, Error *err = NULL; assert(ops); - memory_region_init(mr, owner, name, size); - memory_region_set_ops(mr, ops, opaque); + memory_region_init_io(mr, owner, ops, opaque, name, size); mr->ram_block = qemu_ram_alloc(size, 0, mr, &err); if (!memory_region_do_init_ram(mr, err, errp)) { return false; -- 2.41.3
