From patchwork Thu Apr 19 14:08:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC,9/9,SeaBIOS] enable memory devices if e820 entry is present Date: Thu, 19 Apr 2012 04:08:47 -0000 From: Vasilis Liaskovitis X-Patchwork-Id: 153783 Message-Id: <1334844527-18869-10-git-send-email-vasilis.liaskovitis@profitbricks.com> To: qemu-devel@nongnu.org, kvm@vger.kernel.org, seabios@seabios.org Cc: Vasilis Liaskovitis , avi@redhat.com, gleb@redhat.com On a reboot, seabios regenerates srat/ssdt objects. If a valid e820 entry is found spanning the whole address range of a hotplug memory device, the device will be enabled. This ensures persistency of hotplugged memory slots across VM reboots. Signed-off-by: Vasilis Liaskovitis --- src/acpi.c | 6 +++++- src/memmap.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 5580099..2ebed2e 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -601,7 +601,11 @@ build_memssdt(void) for (i = 0; i < nb_memdevs; i++) { mem_base = (((u64)(entry->base_addr_high) << 32 )| entry->base_addr_low); mem_len = (((u64)(entry->length_high) << 32 )| entry->length_low); - *(ssdt_ptr++) = 0x00; + if (find_e820(mem_base, mem_len, E820_RAM)) { + *(ssdt_ptr++) = 0x01; + } + else + *(ssdt_ptr++) = 0x00; entry++; } build_header((void*)ssdt, SSDT_SIGNATURE, ssdt_ptr - ssdt, 1); diff --git a/src/memmap.c b/src/memmap.c index 56865b4..9790da1 100644 --- a/src/memmap.c +++ b/src/memmap.c @@ -131,6 +131,21 @@ add_e820(u64 start, u64 size, u32 type) //dump_map(); } +// Check if an e820 entry exists that covers the memory range +// [start, start+size) with same type as type. +int +find_e820(u64 start, u64 size, u32 type) +{ + int i; + for (i=0; istart <= start) && (e->size >= (size + start - e->start)) && + (e->type == type)) + return 1; + } + return 0; +} + // Report on final memory locations. void memmap_finalize(void)