diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2014-06-02 15:25:10 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 16:41:48 +0300 |
| commit | de268e134c03612970d6f2c214df6287c9621cc8 (patch) | |
| tree | 161cfb7b8c6e047be413fbc68fb75cc15fb91c77 /hw/i386/pc.c | |
| parent | a0cc8856e8722188583901665c7d9e5ddc752fc0 (diff) | |
| download | qemu-de268e134c03612970d6f2c214df6287c9621cc8.zip qemu-de268e134c03612970d6f2c214df6287c9621cc8.tar.gz qemu-de268e134c03612970d6f2c214df6287c9621cc8.tar.bz2 | |
pc: add 'etc/reserved-memory-end' fw_cfg interface for SeaBIOS
'etc/reserved-memory-end' will allow QEMU to tell BIOS where PCI
BARs mapping could safely start in high memory.
Allowing BIOS to start mapping 64-bit PCI BARs at address where it
wouldn't conflict with other mappings QEMU might place before it.
That permits QEMU to reserve extra address space before
64-bit PCI hole for memory hotplug.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386/pc.c')
| -rw-r--r-- | hw/i386/pc.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 366e799..830aeee 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1226,7 +1226,8 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, } /* initialize hotplug memory address space */ - if (ram_size < machine->maxram_size) { + if (guest_info->has_reserved_memory && + (ram_size < machine->maxram_size)) { ram_addr_t hotplug_mem_size = machine->maxram_size - ram_size; @@ -1266,6 +1267,12 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory, fw_cfg = bochs_bios_init(); rom_set_fw(fw_cfg); + if (guest_info->has_reserved_memory && pcms->hotplug_memory_base) { + uint64_t *val = g_malloc(sizeof(*val)); + *val = cpu_to_le64(ROUND_UP(pcms->hotplug_memory_base, 0x1ULL << 30)); + fw_cfg_add_file(fw_cfg, "etc/reserved-memory-end", val, sizeof(*val)); + } + if (linux_boot) { load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size); } |