david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'kraxel/e820.1' into staging

Browse Source 
* kraxel/e820.1:
  e820: pass high memory too.

Message-id: 1382008179-5968-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
This commit is contained in:
Anthony Liguori 2013-10-31 16:58:58 +01:00
commit a9c78bb82e
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/i386/pc.c
View File

@ -1157,12 +1157,20 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory,
memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram, memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram,
0, below_4g_mem_size); 0, below_4g_mem_size);
memory_region_add_subregion(system_memory, 0, ram_below_4g); memory_region_add_subregion(system_memory, 0, ram_below_4g);
if (0) {
/*
* Ideally we should do that too, but that would ruin the e820
* reservations added by seabios before initializing fw_cfg.
*/
e820_add_entry(0, below_4g_mem_size, E820_RAM);
}
if (above_4g_mem_size > 0) { if (above_4g_mem_size > 0) {
ram_above_4g = g_malloc(sizeof(*ram_above_4g)); ram_above_4g = g_malloc(sizeof(*ram_above_4g));
memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g", ram, memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g", ram,
below_4g_mem_size, above_4g_mem_size); below_4g_mem_size, above_4g_mem_size);
memory_region_add_subregion(system_memory, 0x100000000ULL, memory_region_add_subregion(system_memory, 0x100000000ULL,
ram_above_4g); ram_above_4g);
e820_add_entry(0x100000000ULL, above_4g_mem_size, E820_RAM);
} }