[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/15] memory: Move assignment to ram_block to memory
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/15] memory: Move assignment to ram_block to memory_region_init_* |
Date: |
Mon, 7 Mar 2016 18:36:50 +0100 |
From: Fam Zheng <address@hidden>
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 <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 1 -
memory.c | 5 +++++
2 files changed, 5 insertions(+), 1 deletion(-)
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 d630b01..1aa777d 100644
--- a/memory.c
+++ b/memory.c
@@ -1277,6 +1277,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;
}
@@ -1298,6 +1299,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;
}
@@ -1318,6 +1320,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;
}
@@ -1340,6 +1343,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;
}
@@ -1377,6 +1381,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.5.0
- [Qemu-devel] [PULL 00/15] Memory changes and misc bug fixes for 2016-03-07, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 01/15] log: do not log if QEMU is daemonized but without -D, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 02/15] i8257: fix Terminal Count status, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 03/15] exec: Return RAMBlock pointer from allocating functions, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 04/15] memory: Move assignment to ram_block to memory_region_init_*,
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/15] memory: Implement memory_region_get_ram_addr with mr->ram_block, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 06/15] memory: Drop MemoryRegion.ram_addr, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 07/15] exec: Pass RAMBlock pointer to qemu_ram_free, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 08/15] exec: Factor out section_covers_addr, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 11/15] doc/memory.txt: correct a logic error, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 09/15] exec: Introduce AddressSpaceDispatch.mru_section, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 12/15] doc/memory.txt: correct description of MemoryRegionOps fields, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 13/15] MAINTAINERS: Add entry for include/sysemu/kvm*.h, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 14/15] kvm/irqchip: use bitmap utility for gsi tracking, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 15/15] scsi-bus: Remove tape command from scsi_req_xfer, Paolo Bonzini, 2016/03/07