From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3oTm-0007Nc-7Z for qemu-devel@nongnu.org; Wed, 24 Dec 2014 11:08:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3oTl-00076J-8M for qemu-devel@nongnu.org; Wed, 24 Dec 2014 11:08:06 -0500 Received: from mail-wi0-x231.google.com ([2a00:1450:400c:c05::231]:59875) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3oTl-00076B-1s for qemu-devel@nongnu.org; Wed, 24 Dec 2014 11:08:05 -0500 Received: by mail-wi0-f177.google.com with SMTP id l15so13899263wiw.16 for ; Wed, 24 Dec 2014 08:08:04 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 24 Dec 2014 17:07:40 +0100 Message-Id: <1419437261-21113-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1419437261-21113-1-git-send-email-pbonzini@redhat.com> References: <1419437261-21113-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/4] pc: clean up pre-2.1 compatibility code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, dgilbert@redhat.com, mst@redhat.com Now that the alignment is parameterized, we can share the call to acpi_align_size between all three (1.7-2.0/2.1/2.2+) sizing algorithms. Also, with the new rule that SSDT cannot change except with machine-type compat code, the magic 97 constant for a CPU's AML size is not anymore "legacy", so rename it. Signed-off-by: Paolo Bonzini --- hw/i386/acpi-build.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 1bb3222..df930b7 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -64,8 +64,8 @@ * a little bit, there should be plenty of free space since the DSDT * shrunk by ~1.5k between QEMU 2.0 and QEMU 2.1. */ -#define ACPI_BUILD_LEGACY_CPU_AML_SIZE 97 -#define ACPI_BUILD_ALIGN_SIZE 0x1000 +#define ACPI_BUILD_CPU_AML_SIZE 97 +#define ACPI_BUILD_ALIGN_SIZE 0x1000 /* #define DEBUG_ACPI_BUILD */ #ifdef DEBUG_ACPI_BUILD @@ -1688,10 +1688,9 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) */ int legacy_aml_len = guest_info->legacy_acpi_table_size + - ACPI_BUILD_LEGACY_CPU_AML_SIZE * max_cpus; + ACPI_BUILD_CPU_AML_SIZE * max_cpus; int legacy_table_size = - ROUND_UP(tables->table_data->len - aml_len + legacy_aml_len, - ACPI_BUILD_ALIGN_SIZE); + tables->table_data->len - aml_len + legacy_aml_len; if (tables->table_data->len > legacy_table_size) { /* Should happen only with PCI bridges and -M pc-i440fx-2.0. */ error_report("Warning: migration may not work."); @@ -1707,8 +1706,8 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) error_report("Warning: migration may not work."); error_report("Warning: please upgrade to a newer machine type."); } - acpi_align_size(tables->table_data, guest_info->acpi_table_align); } + acpi_align_size(tables->table_data, guest_info->acpi_table_align); acpi_align_size(tables->linker, ACPI_BUILD_ALIGN_SIZE); -- 1.8.3.1