From patchwork Wed May 29 05:15:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 799811 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp566987wrz; Tue, 28 May 2024 22:17:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX2Sa7IN5H9Pq3WmF4r3YdF/c/SaRGwbqrhSHg99/CmjupE9nmw4Mvd3+GF/5PH7v04Q1BIix9iZ6knA3HT4mgv X-Google-Smtp-Source: AGHT+IHxB0WT1mCEW3FEXM6PIFvp7FnJxxLxXsxs/GW1LXfpYWHIuaafkFk1n4qCZzGAlIThfyZh X-Received: by 2002:a05:620a:bc3:b0:790:c18f:5d94 with SMTP id af79cd13be357-794dfb6c07bmr186441485a.4.1716959854137; Tue, 28 May 2024 22:17:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716959854; cv=none; d=google.com; s=arc-20160816; b=olGQ+AKk79zgOAqH04pH5hSwmxlhLeIFAW/TfSY4nfNpBrl8gZ+YSbcXv2QC/Gx6rB XFoH39Sx/oVWUOHk2/WP/T8vRu3PGrycX9O6dquCu7mwWnSKMqpOsMgvpvfTXKdFgLUh z7PjfaehOkUjScGQ7eHqCwFP3veCtx1IUgE2Mdncwm5PMc1UOf88s9HJSoxpYSix72SE 7EVyoHOA0T77FvOrX+DJrCSECkEH6i7B7iDiihSNGh62d2kWfdoUyabfStge3qbVylv8 zHcRIRSIaMYLVPkObCnI875Cygngk42POCHbkPZpnQlvOXoWbXo6ACR7dKVE8o93WLBN /ZEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hMgYxXaloUTsQPPSCDJh2vu8GvGHL7zNyn/AoZOMXq0=; fh=oSujGHGU6kAtfrTPSJ+sLUg/jC0/xSWRKBD061WPWBw=; b=ibZQLsdrc7LSA08VZQJLzpb4bTEPMrVV4eabs2m3e0x581kRA3LVW+J+sYD37wNJYV I1fd5cdcWjO58VTdbbM15HVpPsCu1sanWX3BqzMCuuNvvaeVqpSks+tHlJxnSM3Ns8P6 n3FY0EBXAg1C8HPnETu80gglasmxTfHh39Lxk9npESfAcFaYLQDEWframwiP0xjfDQEV Zklja5BIw1MBK6uOclrGBKw+HV4h2dCMt59sOL6gl099Vo15VbPpC7kLWWTbFPgNgQMP ksqU8PPD3L39bWm3PUFR/Yw81NURBMleAjbx8wpqHiBH/9QuFBFWdj33HPk6kbZCuvOB o5BQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XObaMnd3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-794abd12cc9si1142840885a.313.2024.05.28.22.17.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 May 2024 22:17:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XObaMnd3; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCBfc-0000MN-IY; Wed, 29 May 2024 01:16:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCBfZ-0000Le-CX for qemu-devel@nongnu.org; Wed, 29 May 2024 01:16:14 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCBfX-0005QD-DW for qemu-devel@nongnu.org; Wed, 29 May 2024 01:16:13 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-354de3c5d00so231421f8f.1 for ; Tue, 28 May 2024 22:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716959769; x=1717564569; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hMgYxXaloUTsQPPSCDJh2vu8GvGHL7zNyn/AoZOMXq0=; b=XObaMnd3/AmioTfT8ulvzWO97nTncaq+az7SRieaxGzv7sNE75H0jmNQLZKhtSqwMb 1upQZBBOHsCzPhCdgOLxMyCT6cFzp9N5JOn6qhnz2VSS2beRLAwzhWJDveMf8QTvZ/hr bztO47LZGxHDkgkCnojqcgpH7J6W0f+lvQhjSF++MJ63UG3J65dJsUsP8y6So9Uv7tpa 9OcD/aV79Ieamo/RiWpIj/3V7Lio3Ty8sz6c5CwVCpnZ0uZFoVsNJbBixFvdCyZl395G aQBUT/Jpuwo5hfRejqrkQqLFRuF57TFNFHO+Ky2LlLGhMElpNLsta729l4CJGK77SV95 J1Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716959769; x=1717564569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hMgYxXaloUTsQPPSCDJh2vu8GvGHL7zNyn/AoZOMXq0=; b=XITXIbIL3TwocpHjcZLFLK7ELRYrL9WS/12rxViB3mUb8FD6aqwXF02XP7Eg6I0bvn ycvhm4qDfaOFFtGksvNErckH0PXs8vlVY6FxSIHW0Rx/HQU4dDsmbZh2xfk9CHbHVUDr Hm0yXDZao3x54p2/m8APT07ucyDlDcjAcz/RC8fY9y04EtCWxQH06/WWVS3Xmu3neZ1/ dYIcd+Fl/g8LzUJnZreceezZEwAdLwXqTn0qMt5ODgtyXkwTTanvsdAUppPaEk9eoTr4 uQhpEnCRmFkdp90OPeSSMRrl0pbq+BnzOIB2nZuTpP7lrFsn3TOq9ieBYVOk+Gr/CKvI 9z2A== X-Gm-Message-State: AOJu0YwZVlxJDDDjY659XQXgGCTt8tqjMiQ5FIYTkxoI0kONPtRhe8h1 Qy4m+CXRQI6q3Bkx8GQQ+L8f5g+rXjVSGaFmEzX35iEcXMg4px5pM3tf/hi+jhLEIE4jx9X6vzQ j X-Received: by 2002:a5d:458a:0:b0:34c:7ed4:55a with SMTP id ffacd0b85a97d-35c7c2b5562mr559086f8f.33.1716959768949; Tue, 28 May 2024 22:16:08 -0700 (PDT) Received: from m1x-phil.lan ([176.187.204.141]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3557dceff3csm13831220f8f.92.2024.05.28.22.16.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 May 2024 22:16:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , "Michael S. Tsirkin" , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PATCH v5 05/23] hw/i386/acpi: Remove PCMachineClass::legacy_acpi_table_size Date: Wed, 29 May 2024 07:15:21 +0200 Message-ID: <20240529051539.71210-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240529051539.71210-1-philmd@linaro.org> References: <20240529051539.71210-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org PCMachineClass::legacy_acpi_table_size was only used by the pc-i440fx-2.0 machine, which got removed. Remove it and simplify acpi_build(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov --- include/hw/i386/pc.h | 1 - hw/i386/acpi-build.c | 62 +++++++++----------------------------------- 2 files changed, 12 insertions(+), 51 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 7347636d47..01fdcfaeb6 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -103,7 +103,6 @@ struct PCMachineClass { /* ACPI compat: */ bool has_acpi_build; bool rsdp_in_ram; - int legacy_acpi_table_size; unsigned acpi_data_size; int pci_root_uid; diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 53f804ac16..a6f8203460 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2499,13 +2499,12 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) X86MachineState *x86ms = X86_MACHINE(machine); DeviceState *iommu = pcms->iommu; GArray *table_offsets; - unsigned facs, dsdt, rsdt, fadt; + unsigned facs, dsdt, rsdt; AcpiPmInfo pm; AcpiMiscInfo misc; AcpiMcfgInfo mcfg; Range pci_hole = {}, pci_hole64 = {}; uint8_t *u; - size_t aml_len = 0; GArray *tables_blob = tables->table_data; AcpiSlicOem slic_oem = { .id = NULL, .table_id = NULL }; Object *vmgenid_dev; @@ -2551,19 +2550,12 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) build_dsdt(tables_blob, tables->linker, &pm, &misc, &pci_hole, &pci_hole64, machine); - /* Count the size of the DSDT and SSDT, we will need it for legacy - * sizing of ACPI tables. - */ - aml_len += tables_blob->len - dsdt; - /* ACPI tables pointed to by RSDT */ - fadt = tables_blob->len; acpi_add_table(table_offsets, tables_blob); pm.fadt.facs_tbl_offset = &facs; pm.fadt.dsdt_tbl_offset = &dsdt; pm.fadt.xdsdt_tbl_offset = &dsdt; build_fadt(tables_blob, tables->linker, &pm.fadt, oem_id, oem_table_id); - aml_len += tables_blob->len - fadt; acpi_add_table(table_offsets, tables_blob); acpi_build_madt(tables_blob, tables->linker, x86ms, @@ -2694,49 +2686,19 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) * too simple to be enough. 4k turned out to be too small an * alignment very soon, and in fact it is almost impossible to * keep the table size stable for all (max_cpus, max_memory_slots) - * combinations. So the table size is always 64k for pc-i440fx-2.1 - * and we give an error if the table grows beyond that limit. - * - * We still have the problem of migrating from "-M pc-i440fx-2.0". For - * that, we exploit the fact that QEMU 2.1 generates _smaller_ tables - * than 2.0 and we can always pad the smaller tables with zeros. We can - * then use the exact size of the 2.0 tables. - * - * All this is for PIIX4, since QEMU 2.0 didn't support Q35 migration. + * combinations. */ - if (pcmc->legacy_acpi_table_size) { - /* Subtracting aml_len gives the size of fixed tables. Then add the - * size of the PIIX4 DSDT/SSDT in QEMU 2.0. - */ - int legacy_aml_len = - pcmc->legacy_acpi_table_size + - ACPI_BUILD_LEGACY_CPU_AML_SIZE * x86ms->apic_id_limit; - int legacy_table_size = - ROUND_UP(tables_blob->len - aml_len + legacy_aml_len, - ACPI_BUILD_ALIGN_SIZE); - if ((tables_blob->len > legacy_table_size) && - !pcmc->resizable_acpi_blob) { - /* Should happen only with PCI bridges and -M pc-i440fx-2.0. */ - warn_report("ACPI table size %u exceeds %d bytes," - " migration may not work", - tables_blob->len, legacy_table_size); - error_printf("Try removing CPUs, NUMA nodes, memory slots" - " or PCI bridges.\n"); - } - g_array_set_size(tables_blob, legacy_table_size); - } else { - /* Make sure we have a buffer in case we need to resize the tables. */ - if ((tables_blob->len > ACPI_BUILD_TABLE_SIZE / 2) && - !pcmc->resizable_acpi_blob) { - /* As of QEMU 2.1, this fires with 160 VCPUs and 255 memory slots. */ - warn_report("ACPI table size %u exceeds %d bytes," - " migration may not work", - tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2); - error_printf("Try removing CPUs, NUMA nodes, memory slots" - " or PCI bridges.\n"); - } - acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE); + /* Make sure we have a buffer in case we need to resize the tables. */ + if ((tables_blob->len > ACPI_BUILD_TABLE_SIZE / 2) && + !pcmc->resizable_acpi_blob) { + /* As of QEMU 2.1, this fires with 160 VCPUs and 255 memory slots. */ + warn_report("ACPI table size %u exceeds %d bytes," + " migration may not work", + tables_blob->len, ACPI_BUILD_TABLE_SIZE / 2); + error_printf("Try removing CPUs, NUMA nodes, memory slots" + " or PCI bridges.\n"); } + acpi_align_size(tables_blob, ACPI_BUILD_TABLE_SIZE); acpi_align_size(tables->linker->cmd_blob, ACPI_BUILD_ALIGN_SIZE);