commit 4ab4c33014b4876bc6d7888efecd6bfcca0d045a
author Joao Martins <joao.m.martins@oracle.com> Tue Jul 19 18:00:04 2022 +0100
committer Michael S. Tsirkin <mst@redhat.com> Tue Jul 26 10:40:58 2022 -0400
tree ce71ccf56576058d5ee12cc7787540f340d77812
parent cb70b7e8712e17e5761a7447defdce5572cd4b80

hw/i386: add 4g boundary start to X86MachineState

Rather than hardcoding the 4G boundary everywhere, introduce a
X86MachineState field @above_4g_mem_start and use it
accordingly.

This is in preparation for relocating ram-above-4g to be
dynamically start at 1T on AMD platforms.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20220719170014.27028-2-joao.m.martins@oracle.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

hw/i386/acpi-build.c

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index cad6f5a..0355bd3 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2024,7 +2024,7 @@
                 build_srat_memory(table_data, mem_base, mem_len, i - 1,
                                   MEM_AFFINITY_ENABLED);
             }
-            mem_base = 1ULL << 32;
+            mem_base = x86ms->above_4g_mem_start;
             mem_len = next_base - x86ms->below_4g_mem_size;
             next_base = mem_base + mem_len;
         }