diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-31 16:58:58 +0100 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-31 16:58:58 +0100 |
| commit | a9c78bb82efd825256c496e69aa884b1da7edea3 (patch) | |
| tree | 6aaef8d0f4450eb7cd4b0528fb5183a7feafc4b0 /hw/i386 | |
| parent | b0eb759fb244c023bc4cee60cb4336eadda3da1a (diff) | |
| parent | 0624c7f916b4d97f17726d9b295d6a6b0dc5076d (diff) | |
| download | qemu-a9c78bb82efd825256c496e69aa884b1da7edea3.tar.gz qemu-a9c78bb82efd825256c496e69aa884b1da7edea3.tar.bz2 qemu-a9c78bb82efd825256c496e69aa884b1da7edea3.zip | |
Merge remote-tracking branch 'kraxel/e820.1' into staging
* 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>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a51f916e94..dee409d271 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1157,12 +1157,20 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram, 0, below_4g_mem_size); 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) { ram_above_4g = g_malloc(sizeof(*ram_above_4g)); memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g", ram, below_4g_mem_size, above_4g_mem_size); memory_region_add_subregion(system_memory, 0x100000000ULL, ram_above_4g); + e820_add_entry(0x100000000ULL, above_4g_mem_size, E820_RAM); } |