From patchwork Wed Mar 27 09:51:18 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: 783114 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp2108017wrt; Wed, 27 Mar 2024 02:55:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFD5RCSLI1u+NQxYg0o23O6O9OyugzK6+BYOT7zkTqFNhr6Oy+dJKZhJNdLyM8i9WzsSnkdh3O4TNN/pXsy7XG X-Google-Smtp-Source: AGHT+IGfdyMvyIwIi2nfUZZOIML7MxF1UW9odTq3zcx9OguFqu8YEGYAKLnT0c7wJYqek3miHQ5q X-Received: by 2002:a05:622a:47cf:b0:431:74f2:ca50 with SMTP id dp15-20020a05622a47cf00b0043174f2ca50mr3523675qtb.38.1711533342770; Wed, 27 Mar 2024 02:55:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711533342; cv=none; d=google.com; s=arc-20160816; b=V5CPJIH1OFkspORffHagxT3tqj8mAEQHMk7TDuHjhUiaug32V/RBLp2b2orbqQlrFV Ll8rJLhUR78k4iVVUNgJPX17qGuQu9B+MYHkpXp9AEWoTEMETQtLsI6Ys02xx/mnYegX zPRC3JHyNZUOoapnfyrkvIBm4JssTJoQ+wsDjPnb9J8og4VhcGp34GnY0eQqe5UBATXi OaJJeuPW8JTXsUrxoTzpQQmMnxk8acLdfGdqqNXMAkvQWv7nVX6UYkuwLNqvnleWCmVm XqbsBM2E3cWBwpoJP6+BlW34RgKqho3DnfNijIiW8E/8+nEZdVBaAX8IbYkciQL1dYvj S+rQ== 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=CpAaHP47+vZlL1G6hguNwYCAsqH5viF1BvNU/Hhh0/U=; fh=XMJoWcuzjtPEInZaUZ9FQA9u/pZbISjmu/ZrZ2dCvqQ=; b=Ccy2JbEvmT55s9Ndh6ncw0Svug5ShLCDpEgnCj0mZLcxltw/Zru+OA3kTtDyg8jnjZ 3b3akVHteTQIcwZwKRy2gFJw9LfZZCB49cIIwMIRNldFLg4TQiRVCEYUYcfOuYbABR/w m8l6MliWZ8gkPOoVzX5jQxjKzjl+RvmC7NR1RFuvkspQgVQt8WNUkI1+GHPojURYUpwv BzkxnSp0nGMDkkU91EOw8WY4JmKu06+w4LvbUAuw+dgq+kor7o02dyuIXl7AiXlraBuP D99bAbk1/aIP+g6+pDcq3E+RbBX4kkRRMlzLD7pZNtEt6RHaUk4FxyRENQBdnML4P6qv pQFg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qzsw+SCy; 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 q9-20020a05622a030900b004317c7eaec6si1472535qtw.602.2024.03.27.02.55.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Mar 2024 02:55:42 -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=Qzsw+SCy; 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 1rpPy9-0006J2-HQ; Wed, 27 Mar 2024 05:53:17 -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 1rpPy2-00063S-UA for qemu-devel@nongnu.org; Wed, 27 Mar 2024 05:53:11 -0400 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rpPy1-0006xV-3i for qemu-devel@nongnu.org; Wed, 27 Mar 2024 05:53:10 -0400 Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-56c0bd07e7bso3647581a12.1 for ; Wed, 27 Mar 2024 02:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711533187; x=1712137987; 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=CpAaHP47+vZlL1G6hguNwYCAsqH5viF1BvNU/Hhh0/U=; b=Qzsw+SCyqgpGgt/UDJfNJ+oqgmAHnfK8ff0U8X37E/Bw6JpgZv9FSA7JC583pB91SD lH3AruD4keXlPsspd1S0DZP0pufrdCUyl5lKX6myMoAN+DffMr6tjuagR+scGGUOpXXz kT2dommPPqJCFcjBaCN7GEvHh4iwcxsRB/XU9K/8pTO+DZy51JKs8mapALzU5h/r4isg 7oteI4SZ5Fg4fnFbAGZSHq9ltiJOTb73Ckc0CVsRDz3C96HneIfjPKk/52XeFWCKPI0t 1zrQwakR+1mGLimdu15fDiF9+SOzHnvIvkyEtDR/c0Kx9Bjp2CVd687xKZtI+2jj1x7Q aZkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711533187; x=1712137987; 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=CpAaHP47+vZlL1G6hguNwYCAsqH5viF1BvNU/Hhh0/U=; b=cOrDw+UQjWHtkLgMhksEkhp6Lpcm/+6no6a1sble16bdeu3bcROdK7xUqlWO/3nyjl M9JleHxBgndF9AhwJbR64QySqJdtj+HV+W893Lv+zL7O6MIcj+vKMC9D1eDZkUXskMqh 1wU2hcfbcCgknKYJHnpoU/HSGmMNKdmymg6WHT2gNx3ImCiuWJ1uVY0qMOL/by5F08Q9 6ZRtFXrVEtIMpgApmhrJIQiXvtyIvj4nPrJ3C7goebKP2N3cfkty2C4hT2jscDITN6x/ QGP/y2x/WbM0hqSxLCrvuutEL/1vv9DtHw4ehtP4UvyXb4oJ3Uh3LsYyi+uO5+a5qjE7 ptSA== X-Forwarded-Encrypted: i=1; AJvYcCV8op2FuOnp6VknpscASAJnWo8sOLjcbd/55u2UU2pu9CMtUPEr7zYCq1MrRpUP42SOenHv+AKncHueGCO/Am7fF0qsVXQ= X-Gm-Message-State: AOJu0YySQ3B0H7Uo/jOe7pmdCTmcX0A8o/A6ETk93AxmXgsP+GXK3vlC pEHcsJYR/B2H4X/13xt48HGS6gaAEE98wPNHOrMNzqBIQEBbESo8tcPS8EhiAeA= X-Received: by 2002:a50:9f0f:0:b0:568:ac09:4a5c with SMTP id b15-20020a509f0f000000b00568ac094a5cmr1614638edf.11.1711533187136; Wed, 27 Mar 2024 02:53:07 -0700 (PDT) Received: from m1x-phil.lan ([176.187.205.175]) by smtp.gmail.com with ESMTPSA id o26-20020aa7c7da000000b0056bf34d656dsm5109579eds.29.2024.03.27.02.53.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 27 Mar 2024 02:53:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , qemu-devel@nongnu.org, Igor Mammedov Cc: Paolo Bonzini , devel@lists.libvirt.org, Zhao Liu , Gerd Hoffmann , "Michael S. Tsirkin" , Ani Sinha , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH-for-9.1 v2 16/21] hw/i386/pc: Remove PCMachineClass::resizable_acpi_blob Date: Wed, 27 Mar 2024 10:51:18 +0100 Message-ID: <20240327095124.73639-17-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240327095124.73639-1-philmd@linaro.org> References: <20240327095124.73639-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=philmd@linaro.org; helo=mail-ed1-x536.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 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::resizable_acpi_blob was only used by the pc-i440fx-2.2 machine, which got removed. It is now always true. Remove it, simplifying acpi_build(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Zhao Liu --- include/hw/i386/pc.h | 3 --- hw/i386/acpi-build.c | 10 ---------- hw/i386/pc.c | 1 - 3 files changed, 14 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index df97df6ca7..10a8ffa0de 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -124,9 +124,6 @@ struct PCMachineClass { /* create kvmclock device even when KVM PV features are not exposed */ bool kvmclock_create_always; - /* resizable acpi blob compat */ - bool resizable_acpi_blob; - /* * whether the machine type implements broken 32-bit address space bound * check for memory. diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index a6f8203460..ab2d4d8dcb 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2688,16 +2688,6 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) * keep the table size stable for all (max_cpus, max_memory_slots) * combinations. */ - /* 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); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c37d813af0..ae2d220269 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1753,7 +1753,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) pcmc->acpi_data_size = 0x20000 + 0x8000; pcmc->pvh_enabled = true; pcmc->kvmclock_create_always = true; - pcmc->resizable_acpi_blob = true; x86mc->apic_xrupt_override = true; assert(!mc->get_hotplug_handler); mc->get_hotplug_handler = pc_get_hotplug_handler;