[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 05/20] exec.c: initialize memory map
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v2 05/20] exec.c: initialize memory map |
Date: |
Mon, 27 Jun 2011 16:21:52 +0300 |
Allocate the root memory region and initialize it.
Signed-off-by: Avi Kivity <address@hidden>
---
exec.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/exec.c b/exec.c
index b03b5be..9b894b9 100644
--- a/exec.c
+++ b/exec.c
@@ -34,6 +34,8 @@
#include "kvm.h"
#include "hw/xen.h"
#include "qemu-timer.h"
+#include "memory.h"
+#include "exec-memory.h"
#if defined(CONFIG_USER_ONLY)
#include <qemu.h>
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -110,6 +112,9 @@ int phys_ram_fd;
static int in_migration;
RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list) };
+
+static MemoryRegion *system_memory;
+
#endif
CPUState *first_cpu;
@@ -198,6 +203,7 @@ typedef struct PhysPageDesc {
static void *l1_phys_map[P_L1_SIZE];
static void io_mem_init(void);
+static void memory_map_init(void);
/* io memory support */
CPUWriteMemoryFunc *io_mem_write[IO_MEM_NB_ENTRIES][4];
@@ -572,6 +578,7 @@ void cpu_exec_init_all(unsigned long tb_size)
code_gen_ptr = code_gen_buffer;
page_init();
#if !defined(CONFIG_USER_ONLY)
+ memory_map_init();
io_mem_init();
#endif
#if !defined(CONFIG_USER_ONLY) || !defined(CONFIG_USE_GUEST_BASE)
@@ -3802,6 +3809,18 @@ static void io_mem_init(void)
DEVICE_NATIVE_ENDIAN);
}
+static void memory_map_init(void)
+{
+ system_memory = qemu_malloc(sizeof(*system_memory));
+ memory_region_init(system_memory, "system", UINT64_MAX);
+ set_system_memory_map(system_memory);
+}
+
+MemoryRegion *get_system_memory(void)
+{
+ return system_memory;
+}
+
#endif /* !defined(CONFIG_USER_ONLY) */
/* physical memory access (slow version, mainly for debug) */
--
1.7.5.3
- [Qemu-devel] [RFC v2 00/20] Memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 08/20] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 18/20] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 14/20] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 06/20] pc: grab system_memory, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 05/20] exec.c: initialize memory map,
Avi Kivity <=
- [Qemu-devel] [RFC v2 20/20] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 02/20] memory: implement dirty tracking, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 17/20] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 07/20] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 12/20] usb-ohci: convert to MemoryRegion, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 09/20] pci: pass address space to pci bus when created, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 16/20] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 19/20] vga: simplify vga window mmio access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 15/20] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 03/20] memory: merge adjacent segments of a single memory region, Avi Kivity, 2011/06/27