From: Eduardo Habkost Date: Fri, 11 Nov 2016 16:45:42 +0000 (-0200) Subject: acpi: Use apic_id_limit when calculating legacy ACPI table size X-Git-Tag: TizenStudio_2.0_p2.3.2~9^2~14^2~5^2~41^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4b5b47abbf23246bd8dde4c6faaed8b7249d8654;p=sdk%2Femulator%2Fqemu.git acpi: Use apic_id_limit when calculating legacy ACPI table size The code that calculates the legacy ACPI table size for migration compatibility uses max_cpus when calculating legacy_aml_len (the size of the DSDT and SSDT tables). However, the SSDT grows according to APIC ID limit, not max_cpus. The bug is not triggered very often because of the 4k alignment on the table size. But it can be triggered if you are unlucky enough to cross a 4k boundary. Change the legacy_aml_len calculation to use apic_id_limit, to calculate the right size. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index a155857..45a2ccf 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2860,7 +2860,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) */ int legacy_aml_len = pcmc->legacy_acpi_table_size + - ACPI_BUILD_LEGACY_CPU_AML_SIZE * max_cpus; + ACPI_BUILD_LEGACY_CPU_AML_SIZE * pcms->apic_id_limit; int legacy_table_size = ROUND_UP(tables_blob->len - aml_len + legacy_aml_len, ACPI_BUILD_ALIGN_SIZE);