From patchwork Tue Apr 16 13:52:31 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: 789208 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:dcf:b0:346:15ad:a2a with SMTP id dw15csp296317wrb; Tue, 16 Apr 2024 06:53:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGD/zNkewNyQZ9drUaPXO9mWgD4yPxr6Bon6xyTjRZKw8Dm6TBuNLBGgqPp6HfQ1686+Pu1MGSNx1W6kgJdKHX X-Google-Smtp-Source: AGHT+IGbOLT9g6vdSrOjjipiTzK49XH8pQBOMd+UQhIozgdRnAn+NgOZiIAQfQNxObehYGLqo8OW X-Received: by 2002:ae9:f40a:0:b0:78d:5c65:dc69 with SMTP id y10-20020ae9f40a000000b0078d5c65dc69mr13848424qkl.33.1713275631492; Tue, 16 Apr 2024 06:53:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713275631; cv=none; d=google.com; s=arc-20160816; b=VvvCuYQFNen4wFPWJNFp4Q4eQUge6C9SgS4+aoj56HA8V2egHa7laz37/3G/Sxfrsp lNMFsIGermzOGLMDiuLNIaK4LhzteBA+MOckh6+iV3ElH6hFrCqhJnLQBtKmlzBT1CO1 iW4DJsJZUBP1Ofp6bceVnQhl1Whq4dw3XtCqw4Xlh34OIetGxLM1LZWfZA4gjZGPo1cN f3keMNkGUhxtDZcEQ4AvTv/+KlhdWY1h0MrVJgDGNGf/LGS3jN8LJZJK2d9iersehIII iAOR15209PIQWS0mwSA6epHu/Rf+2uIKxLGvt85X4LnR/mPvXpTkT55ZeqR47/jVDIrA 3kJA== 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=+LpbxsxzvCGJ1fC5t0rkpqq0GOgUXCM3VX0PEDl04Ig=; fh=5OCUA+doqgtSVf9yWNZ10wRW83EIHMMcZo9SVcrtVkA=; b=XfNkme/Og9o3tJSp0QO4I239eKlz/MeYcKXAPJy4WuMqCbIcEH0HtEeHzCrNPFI3Df V8tWn+brxfHKWZx5fhwZZmCS941h4YfSVDczcLjGRUEj0w40w+IMppbseIFswaFytzBB kzpVKhpJz87TovVxOX8uSr2QdJr7f8iongRaLYa2ZUheiQFjBL286CqxM49N9QW5I205 ArIk9A1t7QQzEP4G2G3GIWFR/l/dCTN5bsybaN8mwiCZ3YI+JeSdeKo7JJPRiSg5/GmU 6mxapNvDyaHh56vKvy7+nZr1wKSNQdxqxDCqEoLCmBWJW7E79+5XBZasr83NjfbRkqm8 kW3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cE5WkVd9; 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 bk37-20020a05620a1a2500b0078d6349929dsi14477153qkb.458.2024.04.16.06.53.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Apr 2024 06:53:51 -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=cE5WkVd9; 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 1rwjFS-0001n7-HO; Tue, 16 Apr 2024 09:53:22 -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 1rwjFN-0001hB-Ut for qemu-devel@nongnu.org; Tue, 16 Apr 2024 09:53:18 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rwjFL-0001W8-BS for qemu-devel@nongnu.org; Tue, 16 Apr 2024 09:53:17 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-418a2de4d8fso1970615e9.2 for ; Tue, 16 Apr 2024 06:53:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713275588; x=1713880388; 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=+LpbxsxzvCGJ1fC5t0rkpqq0GOgUXCM3VX0PEDl04Ig=; b=cE5WkVd9mIxfoQ+mQKj1E+txmzTccUf7e5zRqi0TSnGArUu1KJJEkP/5FnQ4CxnH3i V3og9YNWJdzrjyk/JNaIBMVUkeKq/LCZCl11oXV5niR7ttWNtnodzeU7u3aLAwmnwuaK sZTk6YqBmvH380BFKMGxd7Z0+P4MD29SbfO8XRE0X2LVg84jGRs/XcZ+e2qbz5wT4U+a OWqfNqY9BTI8UuPzKUzAa6nxHs+mwHeTO2zQcTZFbb0vXkQ1AQWL9kr5MqibqnjQCGQ6 943NFEuf1o2IybmP+2V2nFBsHCwR9N8o1G8DcHodsDeWBVGMpIC5AJO7EHbpShuCYXe7 A6IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713275588; x=1713880388; 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=+LpbxsxzvCGJ1fC5t0rkpqq0GOgUXCM3VX0PEDl04Ig=; b=fnYTupdNcGX5ZGf+8ESTjL3l92MPXCQ8faapMa537LoXRgIrubvpCgP9dnjlHEKv/S UH0R8QY2y68L7xDiIRs+JcDZQWuOI4HVdcL34udWI7TmypfStSN5IKs5qB17ELep/jrQ H89oxhcpnQ3kzgKSBdOXfs062Nc8/3LNUU/BJSvpRU5/lUVCFrS5GLNVMJAx7/ppZ1IA /wycNV2IDVpzmv4Pgotbqr5/IyDDrd+clbcShqJZTv8PJkB0a5iyIkFio1n96oItxkG8 7Ho5oSNqeRcvSrwksv1DI6T2upkF1lVWaffiAXqgMWn9mDbilIndG9wYPO1JK40LkhM3 SvBw== X-Gm-Message-State: AOJu0YxThvsIM3AM+MCAnKEC0Up33y19cGGOzaPZceGXl0Ap+0vNEjSI BTs6xMYI1izd3Je3/lbQcETow20wl+isKb0r7Kc0KNUjNrpBPoTwsDlD0VEfKEBoDDiWFgJCPeE j X-Received: by 2002:a05:600c:154e:b0:418:32f7:e87 with SMTP id f14-20020a05600c154e00b0041832f70e87mr5267871wmg.32.1713275588058; Tue, 16 Apr 2024 06:53:08 -0700 (PDT) Received: from m1x-phil.lan ([176.176.155.61]) by smtp.gmail.com with ESMTPSA id bg25-20020a05600c3c9900b004162d06768bsm23584799wmb.21.2024.04.16.06.53.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 16 Apr 2024 06:53:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Thomas Huth Cc: Ani Sinha , qemu-riscv@nongnu.org, qemu-ppc@nongnu.org, Zhao Liu , David Hildenbrand , Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , devel@lists.libvirt.org, Richard Henderson , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v3 02/22] hw/i386/pc: Remove deprecated pc-i440fx-2.0 machine Date: Tue, 16 Apr 2024 15:52:31 +0200 Message-ID: <20240416135252.8384-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240416135252.8384-1-philmd@linaro.org> References: <20240416135252.8384-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=unavailable 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 The pc-i440fx-2.0 machine was deprecated for the 8.2 release (see commit c7437f0ddb "docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated"), time to remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20240305134221.30924-2-philmd@linaro.org> Reviewed-by: Zhao Liu --- docs/about/deprecated.rst | 2 +- docs/about/removed-features.rst | 2 +- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 15 ------------- hw/i386/pc_piix.c | 37 --------------------------------- 5 files changed, 2 insertions(+), 57 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 967ee34267..ef4ad16d41 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -219,7 +219,7 @@ deprecated; use the new name ``dtb-randomness`` instead. The new name better reflects the way this property affects all random data within the device tree blob, not just the ``kaslr-seed`` node. -``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.7`` (since 9.1) +``pc-i440fx-2.1`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.7`` (since 9.1) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' These old machine types are quite neglected nowadays and thus might have diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index f9cf874f7b..51119e623f 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -816,7 +816,7 @@ mips ``fulong2e`` machine alias (removed in 6.0) This machine has been renamed ``fuloong2e``. -``pc-0.10`` up to ``pc-i440fx-1.7`` (removed in 4.0 up to 8.2) +``pc-0.10`` up to ``pc-i440fx-2.0`` (removed in 4.0 up to 9.0) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' These machine types were very old and likely could not be used for live diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 27a68071d7..67856f54c3 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -285,9 +285,6 @@ extern const size_t pc_compat_2_2_len; extern GlobalProperty pc_compat_2_1[]; extern const size_t pc_compat_2_1_len; -extern GlobalProperty pc_compat_2_0[]; -extern const size_t pc_compat_2_0_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ { \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 5c21b0c4db..172814f604 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -311,21 +311,6 @@ GlobalProperty pc_compat_2_1[] = { }; const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1); -GlobalProperty pc_compat_2_0[] = { - PC_CPU_MODEL_IDS("2.0.0") - { "virtio-scsi-pci", "any_layout", "off" }, - { "PIIX4_PM", "memory-hotplug-support", "off" }, - { "apic", "version", "0x11" }, - { "nec-usb-xhci", "superspeed-ports-first", "off" }, - { "nec-usb-xhci", "force-pcie-endcap", "on" }, - { "pci-serial", "prog_if", "0" }, - { "pci-serial-2x", "prog_if", "0" }, - { "pci-serial-4x", "prog_if", "0" }, - { "virtio-net-pci", "guest_announce", "off" }, - { "ICH9-LPC", "memory-hotplug-support", "off" }, -}; -const size_t pc_compat_2_0_len = G_N_ELEMENTS(pc_compat_2_0); - GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled) { GSIState *s; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ec9c299b06..80488a4756 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -441,11 +441,6 @@ static void pc_compat_2_1_fn(MachineState *machine) x86_cpu_change_kvm_default("svm", NULL); } -static void pc_compat_2_0_fn(MachineState *machine) -{ - pc_compat_2_1_fn(machine); -} - #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { @@ -872,38 +867,6 @@ static void pc_i440fx_2_1_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1_fn, pc_i440fx_2_1_machine_options); -static void pc_i440fx_2_0_machine_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_2_1_machine_options(m); - m->hw_version = "2.0.0"; - compat_props_add(m->compat_props, pc_compat_2_0, pc_compat_2_0_len); - pcmc->smbios_legacy_mode = true; - pcmc->has_reserved_memory = false; - /* This value depends on the actual DSDT and SSDT compiled into - * the source QEMU; unfortunately it depends on the binary and - * not on the machine type, so we cannot make pc-i440fx-1.7 work on - * both QEMU 1.7 and QEMU 2.0. - * - * Large variations cause migration to fail for more than one - * consecutive value of the "-smp" maxcpus option. - * - * For small variations of the kind caused by different iasl versions, - * the 4k rounding usually leaves slack. However, there could be still - * one or two values that break. For QEMU 1.7 and QEMU 2.0 the - * slack is only ~10 bytes before one "-smp maxcpus" value breaks! - * - * 6652 is valid for QEMU 2.0, the right value for pc-i440fx-1.7 on - * QEMU 1.7 it is 6414. For RHEL/CentOS 7.0 it is 6418. - */ - pcmc->legacy_acpi_table_size = 6652; - pcmc->acpi_data_size = 0x10000; -} - -DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0_fn, - pc_i440fx_2_0_machine_options); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) {