We can reuse memory_region_init_io in these functions. Also shorten some other function prototypes.
Signed-off-by: BALATON Zoltan <[email protected]> --- system/memory.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/system/memory.c b/system/memory.c index 198d1d0b92..492bf51f48 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); @@ -1677,8 +1674,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, Object *owner, const char *name, uint64_t size, void *ptr) { - memory_region_init(mr, owner, name, size); - memory_region_set_ops(mr, &ram_device_mem_ops, mr); + memory_region_init_io(mr, owner, &ram_device_mem_ops, mr, name, size); memory_region_setup_ram(mr); /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ assert(ptr != NULL); @@ -1686,12 +1682,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; @@ -3706,8 +3699,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); memory_region_setup_ram(mr); mr->ram_block = qemu_ram_alloc(size, 0, mr, &err); if (!memory_region_error_propagate(mr, err, errp)) { -- 2.41.3
