From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c7lUb-00075o-KJ for qemu-devel@nongnu.org; Fri, 18 Nov 2016 10:54:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c7lUW-0006y8-PJ for qemu-devel@nongnu.org; Fri, 18 Nov 2016 10:54:21 -0500 Received: from mail.kernel.org ([198.145.29.136]:40892) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c7lUW-0006xN-Iv for qemu-devel@nongnu.org; Fri, 18 Nov 2016 10:54:16 -0500 Date: Fri, 18 Nov 2016 17:54:04 +0200 From: "Michael S. Tsirkin" Message-ID: <1479484366-7977-8-git-send-email-mst@redhat.com> References: <1479484366-7977-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1479484366-7977-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 7/7] acpi: Use apic_id_limit when calculating legacy ACPI table size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Igor Mammedov , Paolo Bonzini , Richard Henderson From: Eduardo Habkost 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 --- hw/i386/acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- MST