From: BALATON Zoltan Date: Sat, 7 Mar 2026 23:06:04 +0000 (+0100) Subject: memory: Shorten memory_region_init_ram_device_ptr and memory_region_init_rom_device X-Git-Tag: v11.0.0-rc0~22^2~12 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=8fe668d0b492b4f85085c84255ae6e01007a14c7;p=thirdparty%2Fqemu.git memory: Shorten memory_region_init_ram_device_ptr and memory_region_init_rom_device We can reuse memory_region_init_io in these functions. Signed-off-by: BALATON Zoltan Reviewed-by: Akihiko Odaki Link: https://lore.kernel.org/r/79ff00abd2eb5c304f1f00664c94784e1269d984.1772924151.git.balaton@eik.bme.hu Signed-off-by: Peter Xu --- diff --git a/system/memory.c b/system/memory.c index e15f931a8ae..13d4e3314bc 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);