[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/8] acpi-build: tweak acpi migration limits
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 7/8] acpi-build: tweak acpi migration limits |
Date: |
Tue, 29 Jul 2014 12:48:53 +0200 |
- Tweak error message for legacy machine type:
Basically if table size exceeds the limits we set all
bets are off for migration: e.g. it can start failing even
within given qemu minor version simply because of a bugfix.
- Increase table size to 128k.
- Make sure we notice it long before we start getting close to the
128k limit: warn at 64k.
- Don't fail if we exceed the limit: most people don't care about
migration, even less people care about cross version miration.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
hw/i386/acpi-build.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 2178894..816c6d9 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -62,7 +62,7 @@
#define ACPI_BUILD_LEGACY_CPU_AML_SIZE 97
#define ACPI_BUILD_ALIGN_SIZE 0x1000
-#define ACPI_BUILD_TABLE_SIZE 0x10000
+#define ACPI_BUILD_TABLE_SIZE 0x20000
typedef struct AcpiCpuInfo {
DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT);
@@ -1586,17 +1586,19 @@ void acpi_build(PcGuestInfo *guest_info,
AcpiBuildTables *tables)
ACPI_BUILD_ALIGN_SIZE);
if (tables->table_data->len > legacy_table_size) {
/* Should happen only with PCI bridges and -M pc-i440fx-2.0. */
- error_report("Warning: migration to QEMU 2.0 may not work.");
+ error_report("Warning: migration may not work.");
}
g_array_set_size(tables->table_data, legacy_table_size);
} else {
- if (tables->table_data->len > ACPI_BUILD_TABLE_SIZE) {
+ /* Make sure we have a buffer in case we need to resize the tables. */
+ if (tables->table_data->len > ACPI_BUILD_TABLE_SIZE / 2) {
/* 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);
+ error_report("Warning: ACPI tables are larger than 64k.");
+ error_report("Warning: migration may not work.");
+ error_report("Warning: please remove CPUs, NUMA nodes, "
+ "memory slots or PCI bridges.");
}
- g_array_set_size(tables->table_data, ACPI_BUILD_TABLE_SIZE);
+ acpi_align_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, 2014/07/29
- [Qemu-devel] [PULL 7/8] acpi-build: tweak acpi migration limits,
Michael S. Tsirkin <=
- [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