Allocate memory below 4GB as one chunk

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>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Avi Kivity 2010-02-24 18:11:19 -03:00 committed by Marcelo Tosatti
parent 55b1e61f64
commit 60e4c6317b

11
hw/pc.c
View File

@ -833,18 +833,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) {