mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc: future-proof migration-compatibility of ACPI tables

Browse Source 
This patch avoids that similar changes break QEMU again in the future.
QEMU will now hard-code 64k as the maximum ACPI table size, which
(despite being an order of magnitude smaller than 640k) should be enough
for everyone.

Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-07-28 17:34:16 +02:00 committed by Michael S. Tsirkin
parent 093a35e5fc
commit 18045fb9f4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/i386/acpi-build.c
View File

@ -62,6 +62,8 @@
#define ACPI_BUILD_LEGACY_CPU_AML_SIZE 97 #define ACPI_BUILD_LEGACY_CPU_AML_SIZE 97
#define ACPI_BUILD_ALIGN_SIZE 0x1000 #define ACPI_BUILD_ALIGN_SIZE 0x1000
#define ACPI_BUILD_TABLE_SIZE 0x10000
typedef struct AcpiCpuInfo { typedef struct AcpiCpuInfo {
DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT); DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT);
} AcpiCpuInfo; } AcpiCpuInfo;
@ -1588,7 +1590,13 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables)
} }
g_array_set_size(tables->table_data, legacy_table_size); g_array_set_size(tables->table_data, legacy_table_size);
} else { } else {
acpi_align_size(tables->table_data, ACPI_BUILD_ALIGN_SIZE); if (tables->table_data->len > ACPI_BUILD_TABLE_SIZE) {
/* As of QEMU 2.1, this fires with 160 VCPUs and 255 memory slots. */
error_report("ACPI tables are larger than 64k. Please remove");
error_report("CPUs, NUMA nodes, memory slots or PCI bridges.");
exit(1);
}
g_array_set_size(tables->table_data, ACPI_BUILD_TABLE_SIZE);
} }
acpi_align_size(tables->linker, ACPI_BUILD_ALIGN_SIZE); acpi_align_size(tables->linker, ACPI_BUILD_ALIGN_SIZE);