From 82b36dc39890f1ba6b7017b8d2e912503cef6cf9 Mon Sep 17 00:00:00 2001 From: aliguori Date: Mon, 15 Sep 2008 16:01:01 +0000 Subject: [PATCH] Right now, kvm keeps the memory allocation split, so we can handle different areas in different ways. This schema works with qemu too, so it appears to be the common ground. This patch proposes using this common ground for everyone, by spliting raw qemu. Signed-off-by: Glauber Costa Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5228 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/pc.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 435c7d48fd..9fd1bdfd40 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -777,16 +777,28 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, vmport_init(); /* allocate RAM */ - ram_addr = qemu_ram_alloc(ram_size); - cpu_register_physical_memory(0, below_4g_mem_size, ram_addr); + ram_addr = qemu_ram_alloc(0xa0000); + cpu_register_physical_memory(0, 0xa0000, ram_addr); + + /* Allocate, even though we won't register, so we don't break the + * phys_ram_base + PA assumption. This range includes vga (0xa0000 - 0xc0000), + * and some bios areas, which will be registered later + */ + ram_addr = qemu_ram_alloc(0x100000 - 0xa0000); + ram_addr = qemu_ram_alloc(below_4g_mem_size - 0x100000); + cpu_register_physical_memory(0x100000, + below_4g_mem_size - 0x100000, + ram_addr); /* above 4giga memory allocation */ if (above_4g_mem_size > 0) { - cpu_register_physical_memory((target_phys_addr_t) 0x100000000ULL, + ram_addr = qemu_ram_alloc(above_4g_mem_size); + cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, - ram_addr + below_4g_mem_size); + ram_addr); } + /* allocate VGA RAM */ vga_ram_addr = qemu_ram_alloc(vga_ram_size);