[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/8] pc: future-proof migration-compatibility of ACPI
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 6/8] pc: future-proof migration-compatibility of ACPI tables |
Date: |
Tue, 29 Jul 2014 12:48:48 +0200 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/acpi-build.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index ec86f1b..2178894 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -62,6 +62,8 @@
#define ACPI_BUILD_LEGACY_CPU_AML_SIZE 97
#define ACPI_BUILD_ALIGN_SIZE 0x1000
+#define ACPI_BUILD_TABLE_SIZE 0x10000
+
typedef struct AcpiCpuInfo {
DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT);
} AcpiCpuInfo;
@@ -1588,7 +1590,13 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables
*tables)
}
g_array_set_size(tables->table_data, legacy_table_size);
} 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);
--
MST
- [Qemu-devel] [PULL 0/8] pc migration fixes, Michael S. Tsirkin, 2014/07/29
- [Qemu-devel] [PULL 1/8] acpi-dsdt: procedurally generate _PRT, Michael S. Tsirkin, 2014/07/29
- [Qemu-devel] [PULL 2/8] pc: hack for migration compatibility from QEMU 2.0, Michael S. Tsirkin, 2014/07/29
- [Qemu-devel] [PULL 3/8] bios-tables-test: fix ASL normalization false positive, Michael S. Tsirkin, 2014/07/29
- [Qemu-devel] [PULL 4/8] pc: acpi: generate AML only for PCI0 devices if PCI bridge hotplug is disabled, Michael S. Tsirkin, 2014/07/29
- [Qemu-devel] [PULL 5/8] acpi-build: minor code cleanup, Michael S. Tsirkin, 2014/07/29
- [Qemu-devel] [PULL 6/8] pc: future-proof migration-compatibility of ACPI tables,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 7/8] acpi-build: tweak acpi migration limits, Michael S. Tsirkin, 2014/07/29
- [Qemu-devel] [PULL 8/8] piix: set legacy table size for 1.7, Michael S. Tsirkin, 2014/07/29
- Re: [Qemu-devel] [PULL 0/8] pc migration fixes, Peter Maydell, 2014/07/29