OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

memory: Move assignment to ram_block to memory_region_init_*

Browse Source 
We don't force "const" qualifiers with pointers in QEMU, but it's still
good to keep a clean function interface. Assigning to mr->ram_block is
in this sense ugly - one initializer mutating its owning object's state.

Move it to memory_region_init_*, where mr->ram_addr is assigned.

Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1456813104-25902-3-git-send-email-famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Fam Zheng 2016-03-01 14:18:19 +08:00 committed by Paolo Bonzini
parent 528f46af6e
commit 0a75601853
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
exec.c
View File

@ -1711,7 +1711,6 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
error_propagate(errp, local_err); error_propagate(errp, local_err);
return NULL; return NULL;
} }
mr->ram_block = new_block;
return new_block; return new_block;
} }

5
memory.c
View File

@ -1277,6 +1277,7 @@ void memory_region_init_ram(MemoryRegion *mr,
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_ram; mr->destructor = memory_region_destructor_ram;
ram_block = qemu_ram_alloc(size, mr, errp); ram_block = qemu_ram_alloc(size, mr, errp);
mr->ram_block = ram_block;
mr->ram_addr = ram_block->offset; mr->ram_addr = ram_block->offset;
mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
@ -1298,6 +1299,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_ram; mr->destructor = memory_region_destructor_ram;
ram_block = qemu_ram_alloc_resizeable(size, max_size, resized, mr, errp); ram_block = qemu_ram_alloc_resizeable(size, max_size, resized, mr, errp);
mr->ram_block = ram_block;
mr->ram_addr = ram_block->offset; mr->ram_addr = ram_block->offset;
mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
@ -1318,6 +1320,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
mr->terminates = true; mr->terminates = true;
mr->destructor = memory_region_destructor_ram; mr->destructor = memory_region_destructor_ram;
ram_block = qemu_ram_alloc_from_file(size, mr, share, path, errp); ram_block = qemu_ram_alloc_from_file(size, mr, share, path, errp);
mr->ram_block = ram_block;
mr->ram_addr = ram_block->offset; mr->ram_addr = ram_block->offset;
mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
} }
@ -1340,6 +1343,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
/* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */ /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */
assert(ptr != NULL); assert(ptr != NULL);
ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal); ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal);
mr->ram_block = ram_block;
mr->ram_addr = ram_block->offset; mr->ram_addr = ram_block->offset;
} }
@ -1377,6 +1381,7 @@ void memory_region_init_rom_device(MemoryRegion *mr,
mr->rom_device = true; mr->rom_device = true;
mr->destructor = memory_region_destructor_rom_device; mr->destructor = memory_region_destructor_rom_device;
ram_block = qemu_ram_alloc(size, mr, errp); ram_block = qemu_ram_alloc(size, mr, errp);
mr->ram_block = ram_block;
mr->ram_addr = ram_block->offset; mr->ram_addr = ram_block->offset;
} }