From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ke8YD-0003hh-Nc for qemu-devel@nongnu.org; Fri, 12 Sep 2008 09:19:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ke8YC-0003ds-3o for qemu-devel@nongnu.org; Fri, 12 Sep 2008 09:19:05 -0400 Received: from [199.232.76.173] (port=47982 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ke8YB-0003dd-Nd for qemu-devel@nongnu.org; Fri, 12 Sep 2008 09:19:03 -0400 Received: from mx2.redhat.com ([66.187.237.31]:47506) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ke8YB-00051q-EI for qemu-devel@nongnu.org; Fri, 12 Sep 2008 09:19:03 -0400 From: Glauber Costa Date: Fri, 12 Sep 2008 10:18:10 -0300 Message-Id: <1221225490-29531-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH] split memory allocation Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com 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 --- hw/pc.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 435c7d4..d6084ee 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -777,16 +777,24 @@ 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); + + ram_addr = qemu_ram_alloc(0x100000 - 0xa0000); /* hole */ + 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); -- 1.5.5.1