Patchwork [uq/master,1/2] Allocate memory below 4GB as one chunk

login
register
mail settings
Submitter Marcelo Tosatti
Date Feb. 24, 2010, 9:11 p.m.
Message ID <20100224211507.671656939@amt.cnet>
Download mbox | patch
Permalink /patch/46207/
State New
Headers show

Comments

Marcelo Tosatti - Feb. 24, 2010, 9:11 p.m.
From: Avi Kivity <avi@redhat.com>

Instead of allocating a separate chunk for the first 640KB and another
for 1MB+, allocate one large chunk.  This plays well in terms of alignment
and size with large pages.

Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit cfe0cef63988a7876a9bbcb098500a3983e63814)
Avi Kivity - Feb. 25, 2010, 1:33 p.m.
On 02/24/2010 11:11 PM, Marcelo Tosatti wrote:
> From: Avi Kivity<avi@redhat.com>
>
> Instead of allocating a separate chunk for the first 640KB and another
> for 1MB+, allocate one large chunk.  This plays well in terms of alignment
> and size with large pages.
>
> Signed-off-by: Avi Kivity<avi@redhat.com>
> (cherry picked from commit cfe0cef63988a7876a9bbcb098500a3983e63814)
>    

Note: qemu-kvm.git commit hashes are not meaningful in qemu.git, so 
don't add them to uq commit logs please.

Patch

Index: qemu-kvm/hw/pc.c
===================================================================
--- qemu-kvm.orig/hw/pc.c
+++ qemu-kvm/hw/pc.c
@@ -798,18 +798,11 @@  static void pc_init1(ram_addr_t ram_size
     vmport_init();
 
     /* allocate RAM */
-    ram_addr = qemu_ram_alloc(0xa0000);
+    ram_addr = qemu_ram_alloc(below_4g_mem_size);
     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);
+                 ram_addr + 0x100000);
 
     /* above 4giga memory allocation */
     if (above_4g_mem_size > 0) {