diff options
| author | Avi Kivity <avi@redhat.com> | 2010-02-24 18:11:19 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-04 00:28:41 -0300 |
| commit | 60e4c6317b8773d987729401aeca9d8c6b61b05f (patch) | |
| tree | 910fd8cd4c4837775ce1c8be46d24b1c5f6775ad | |
| parent | 55b1e61f640bb2cf3bed0b4cc6d4ba1326c625d9 (diff) | |
| download | focaccia-qemu-60e4c6317b8773d987729401aeca9d8c6b61b05f.tar.gz focaccia-qemu-60e4c6317b8773d987729401aeca9d8c6b61b05f.zip | |
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>
| -rw-r--r-- | hw/pc.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/hw/pc.c b/hw/pc.c index 4f6a5228fd..bdc297f717 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -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) { |