From: BALATON Zoltan <[email protected]> We can reuse memory_region_init_io in these functions.
Signed-off-by: BALATON Zoltan <[email protected]> Reviewed-by: Akihiko Odaki <[email protected]> Link: https://lore.kernel.org/r/79ff00abd2eb5c304f1f00664c94784e1269d984.1772924151.git.bala...@eik.bme.hu Signed-off-by: Peter Xu <[email protected]> --- system/memory.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/system/memory.c b/system/memory.c index e15f931a8a..13d4e3314b 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1705,10 +1705,9 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, uint64_t size, void *ptr) { - memory_region_init(mr, owner, name, size); + memory_region_init_io(mr, owner, &ram_device_mem_ops, mr, name, size); mr->ram = true; mr->ram_device = true; - memory_region_set_ops(mr, &ram_device_mem_ops, mr); mr->destructor = memory_region_destructor_ram; /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ @@ -3762,8 +3761,7 @@ bool memory_region_init_rom_device(MemoryRegion *mr, 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->rom_device = true; mr->destructor = memory_region_destructor_ram; mr->ram_block = qemu_ram_alloc(size, 0, mr, &err); -- 2.50.1
