We can reuse memory_region_init_io in these functions.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
system/memory.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/system/memory.c b/system/memory.c
index dfbb4b85df..c67c8b126b 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -1686,9 +1686,9 @@ 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_init_io(mr, owner, &ram_device_mem_ops, mr, name, size);
memory_region_setup_ram(mr);
- memory_region_set_ops(mr, &ram_device_mem_ops, mr);
/* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */
assert(ptr != NULL);
mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort);
@@ -3712,8 +3712,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 (err) {
--
2.41.3