[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/6] memory: Move assignment to ram_block to mem
From: |
Gonglei (Arei) |
Subject: |
Re: [Qemu-devel] [PATCH 2/6] memory: Move assignment to ram_block to memory_region_init_* |
Date: |
Tue, 1 Mar 2016 02:27:27 +0000 |
> Subject: [Qemu-devel] [PATCH 2/6] memory: Move assignment to ram_block to
> memory_region_init_*
>
> 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.
>
> Signed-off-by: Fam Zheng <address@hidden>
> ---
> exec.c | 1 -
> memory.c | 5 +++++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
Reviewed-by: Gonglei <address@hidden>
> diff --git a/exec.c b/exec.c
> index 2b14b79..83e3f7d 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -1711,7 +1711,6 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t
> size, ram_addr_t max_size,
> error_propagate(errp, local_err);
> return NULL;
> }
> - mr->ram_block = new_block;
> return new_block;
> }
>
> diff --git a/memory.c b/memory.c
> index ae13ba9..fe70075 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -1233,6 +1233,7 @@ void memory_region_init_ram(MemoryRegion *mr,
> mr->terminates = true;
> mr->destructor = memory_region_destructor_ram;
> ram_block = qemu_ram_alloc(size, mr, errp);
> + mr->ram_block = ram_block;
> mr->ram_addr = ram_block->offset;
> mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
> }
> @@ -1254,6 +1255,7 @@ void
> memory_region_init_resizeable_ram(MemoryRegion *mr,
> mr->terminates = true;
> mr->destructor = memory_region_destructor_ram;
> ram_block = qemu_ram_alloc_resizeable(size, max_size, resized, mr,
> errp);
> + mr->ram_block = ram_block;
> mr->ram_addr = ram_block->offset;
> mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
> }
> @@ -1274,6 +1276,7 @@ void
> memory_region_init_ram_from_file(MemoryRegion *mr,
> mr->terminates = true;
> mr->destructor = memory_region_destructor_ram;
> ram_block = qemu_ram_alloc_from_file(size, mr, share, path, errp);
> + mr->ram_block = ram_block;
> mr->ram_addr = ram_block->offset;
> mr->dirty_log_mask = tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0;
> }
> @@ -1296,6 +1299,7 @@ void memory_region_init_ram_ptr(MemoryRegion
> *mr,
> /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL. */
> assert(ptr != NULL);
> ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal);
> + mr->ram_block = ram_block;
> mr->ram_addr = ram_block->offset;
> }
>
> @@ -1333,6 +1337,7 @@ void
> memory_region_init_rom_device(MemoryRegion *mr,
> mr->rom_device = true;
> mr->destructor = memory_region_destructor_rom_device;
> ram_block = qemu_ram_alloc(size, mr, errp);
> + mr->ram_block = ram_block;
> mr->ram_addr = ram_block->offset;
> }
>
> --
> 2.4.3
>
- [Qemu-devel] [PATCH 0/6] memory: Clean up MemoryRegion.ram_addr and optimize address_space_translate, Fam Zheng, 2016/02/28
- [Qemu-devel] [PATCH 1/6] exec: Return RAMBlock pointer from allocating functions, Fam Zheng, 2016/02/28
- [Qemu-devel] [PATCH 2/6] memory: Move assignment to ram_block to memory_region_init_*, Fam Zheng, 2016/02/28
- Re: [Qemu-devel] [PATCH 2/6] memory: Move assignment to ram_block to memory_region_init_*,
Gonglei (Arei) <=
- [Qemu-devel] [PATCH 3/6] memory: Implement memory_region_get_ram_addr with mr->ram_block, Fam Zheng, 2016/02/28
- [Qemu-devel] [PATCH 4/6] memory: Drop MemoryRegion.ram_addr, Fam Zheng, 2016/02/28
- [Qemu-devel] [PATCH 5/6] exec: Pass RAMBlock pointer to qemu_ram_free, Fam Zheng, 2016/02/28
- [Qemu-devel] [PATCH 6/6] exec: Introduce AddressSpaceDispatch.mru_section, Fam Zheng, 2016/02/28