[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3.2 18/31] memory: move RAM_PREALLOC_MASK to exec.c
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v3.2 18/31] memory: move RAM_PREALLOC_MASK to exec.c, rename |
Date: |
Wed, 14 May 2014 17:43:22 +0800 |
From: Paolo Bonzini <address@hidden>
Prepare for adding more flags. The "_MASK" suffix is unique, kill it.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hu Tao <address@hidden>
---
exec.c | 9 ++++++---
include/exec/cpu-all.h | 3 ---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/exec.c b/exec.c
index 99dcd14..b46cce4 100644
--- a/exec.c
+++ b/exec.c
@@ -70,6 +70,9 @@ AddressSpace address_space_memory;
MemoryRegion io_mem_rom, io_mem_notdirty;
static MemoryRegion io_mem_unassigned;
+/* RAM is pre-allocated and passed into qemu_ram_alloc_from_ptr */
+#define RAM_PREALLOC (1 << 0)
+
#endif
struct CPUTailQ cpus = QTAILQ_HEAD_INITIALIZER(cpus);
@@ -1316,7 +1319,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void
*host,
new_block->fd = -1;
new_block->host = host;
if (host) {
- new_block->flags |= RAM_PREALLOC_MASK;
+ new_block->flags |= RAM_PREALLOC;
}
return ram_block_add(new_block);
}
@@ -1355,7 +1358,7 @@ void qemu_ram_free(ram_addr_t addr)
QTAILQ_REMOVE(&ram_list.blocks, block, next);
ram_list.mru_block = NULL;
ram_list.version++;
- if (block->flags & RAM_PREALLOC_MASK) {
+ if (block->flags & RAM_PREALLOC) {
;
} else if (xen_enabled()) {
xen_invalidate_map_cache_entry(block->host);
@@ -1387,7 +1390,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
offset = addr - block->offset;
if (offset < block->length) {
vaddr = block->host + offset;
- if (block->flags & RAM_PREALLOC_MASK) {
+ if (block->flags & RAM_PREALLOC) {
;
} else if (xen_enabled()) {
abort();
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index dfdd071..6960544 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -414,9 +414,6 @@ CPUArchState *cpu_copy(CPUArchState *env);
/* memory API */
-/* RAM is pre-allocated and passed into qemu_ram_alloc_from_ptr */
-#define RAM_PREALLOC_MASK (1 << 0)
-
typedef struct RAMBlock {
struct MemoryRegion *mr;
uint8_t *host;
--
1.8.5.2.229.g4448466
- [Qemu-devel] [PATCH v3.2 09/31] qmp: improve error reporting for -object and object-add, (continued)
- [Qemu-devel] [PATCH v3.2 09/31] qmp: improve error reporting for -object and object-add, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 02/31] NUMA: check if the total numa memory size is equal to ram_size, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 10/31] pc: pass QEMUMachineInitArgs to pc_memory_init, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 15/31] memory: move mem_path handling to memory_region_allocate_system_memory, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 04/31] NUMA: convert -numa option to use OptsVisitor, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 11/31] numa: introduce memory_region_allocate_system_memory, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 12/31] add memdev backend infrastructure, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 14/31] memory: reorganize file-based allocation, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 17/31] memory: move preallocation code out of exec.c, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 13/31] numa: add -numa node, memdev= option, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 18/31] memory: move RAM_PREALLOC_MASK to exec.c, rename,
Hu Tao <=
- [Qemu-devel] [PATCH v3.2 16/31] memory: add error propagation to file-based RAM allocation, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 19/31] hostmem: add file-based HostMemoryBackend, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 20/31] hostmem: separate allocation from UserCreatable complete method, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 22/31] hostmem: allow preallocation of any memory region, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 21/31] hostmem: add merge and dump properties, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 24/31] configure: add Linux libnuma detection, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 25/31] hostmem: add properties for NUMA memory policy, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 23/31] hostmem: add property to map memory with MAP_SHARED, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 27/31] qapi: make string input visitor parse int list, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 26/31] Introduce signed range., Hu Tao, 2014/05/14