[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 071/106] memory: move RAM_PREALLOC_MASK to exec.c,
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 071/106] memory: move RAM_PREALLOC_MASK to exec.c, rename |
Date: |
Wed, 18 Jun 2014 19:20:14 +0300 |
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>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/exec/cpu-all.h | 3 ---
exec.c | 9 ++++++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index eaddea6..f91581f 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -297,9 +297,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;
diff --git a/exec.c b/exec.c
index f32e15d..98878a4 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);
@@ -1309,7 +1312,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);
}
@@ -1348,7 +1351,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);
@@ -1380,7 +1383,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();
--
MST
- [Qemu-devel] [PULL v2 060/106] Add qtest for vhost-user, (continued)
- [Qemu-devel] [PULL v2 060/106] Add qtest for vhost-user, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 061/106] NUMA: move numa related code to new file numa.c, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 063/106] NUMA: Add numa_info structure to contain numa nodes info, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 064/106] NUMA: convert -numa option to use OptsVisitor, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 065/106] NUMA: expand MAX_NODES from 64 to 128, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 066/106] man: improve -numa doc, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 067/106] qmp: improve error reporting for -object and object-add, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 068/106] numa: introduce memory_region_allocate_system_memory, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 069/106] memory: reorganize file-based allocation, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 070/106] memory: move preallocation code out of exec.c, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 071/106] memory: move RAM_PREALLOC_MASK to exec.c, rename,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 073/106] Introduce signed range., Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 075/106] numa: add -numa node, memdev= option, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 079/106] pc: pass MachineState to pc_memory_init, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 080/106] backend:hostmem: replace hostmemory with host_memory, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 081/106] hostmem: separate allocation from UserCreatable complete method, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 082/106] hostmem: add file-based HostMemoryBackend, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 083/106] hostmem: add merge and dump properties, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 084/106] hostmem: allow preallocation of any memory region, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 085/106] hostmem: add property to map memory with MAP_SHARED, Michael S. Tsirkin, 2014/06/18
- [Qemu-devel] [PULL v2 086/106] hostmem: add properties for NUMA memory policy, Michael S. Tsirkin, 2014/06/18