diff options
| -rw-r--r-- | hw/i386/acpi-build.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 2178894f67..816c6d9b47 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); |