From patchwork Mon Jun 17 07:11:15 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: 804862 Delivered-To: patch@linaro.org Received: by 2002:adf:fb90:0:b0:360:93e7:1765 with SMTP id a16csp434774wrr; Mon, 17 Jun 2024 00:14:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVP/ARj0iU0Th0z5aMc3EkdkgzdoFfSrszHobaN3sC8z+/f+rCSPYWwa6hETt3BRpezXWa5v71K4D4Sc1yEJMsX X-Google-Smtp-Source: AGHT+IEwbSIboE0iCuiQJ7jF1H7phQfyDi3JzQoNN/gB/GnJYad/t0qmjr1uuDXwZFITGmUpfVxy X-Received: by 2002:ad4:58a5:0:b0:6b0:7e75:af3d with SMTP id 6a1803df08f44-6b2afd6cb21mr91134436d6.41.1718608483593; Mon, 17 Jun 2024 00:14:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718608483; cv=none; d=google.com; s=arc-20160816; b=LgM4QmvA/0xYedJfpwBoU7TTj5CKY7p9jurifa1HC1hPAk8FrokKX1s2MD2+JQyrjj RQBsO8ervEPAVCW9D+zpXsF2W2OgAWTsaisvuIcBhCxjTZFwVI8LFJonracpJNnyhBC8 3ChjASjCOuPwdTZX/XGi2U5pOEfHHSLCutMAlobwYdn/jK3kxWDYMS9iMWCBVlKzzfdT DFEQLaZIvI/rcl056EnmJxGlWUILPwfm82u1mNOs2/NL6PW/qI5KRzbXx3K/H7Rk70m0 9s+lzf8zrPciegdYj75MdxmunuHG/a+ynDu0f0aHYksteIobGozSvRaJN14MbOMXzJcW RFkw== 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=b4PiFUbc5Z/4UeWoEg22x49vbzui05kVY5z2eOCt8Ms=; fh=LxU1EPCBVYorV++vrCt2dyzDsbIeuRBouOVrSj5U16k=; b=WyOK4U4SYg0vPkStge3Tv0CBbdmT3tRJjnYeCkvBJT208ereI2AeIQnKjsis+8l4uq MW1B8Q8J9frKal5vSzPiowcWv4AtLt5F6qXayJ1ywCw1gUHCv3WR/4KGuhqQpHT3yFx8 C7bCLmy0ZrAiGZh/xtnon6ivm5nxZtKVUyZRf0qQ8Qbfqh5WWB14rDmgAguZB2s6ZO5F 3HxXLXGRpKWcAdwXGgZ5MN+vjuIhqSMi3Za9wwz30k1BY3dW+SuUDrGV107pB5DdUQNV VSfiee473Ktme41TmLFFcklaMHB16dyt3EC7GU8x+zXHQRGdJv4lHZM8Wc7Z2gOToNB9 DAPQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FI0GlDHL; 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 6a1803df08f44-6b2a5afd076si96007566d6.236.2024.06.17.00.14.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Jun 2024 00:14:43 -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=FI0GlDHL; 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 1sJ6Ya-0000yU-0x; Mon, 17 Jun 2024 03:13:36 -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 1sJ6YH-0000W2-Ql for qemu-devel@nongnu.org; Mon, 17 Jun 2024 03:13:20 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJ6YF-0002Rj-GH for qemu-devel@nongnu.org; Mon, 17 Jun 2024 03:13:17 -0400 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a689ad8d1f6so494719466b.2 for ; Mon, 17 Jun 2024 00:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718608394; x=1719213194; 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=b4PiFUbc5Z/4UeWoEg22x49vbzui05kVY5z2eOCt8Ms=; b=FI0GlDHLpL81w/ZtWgJgstBbW97EyKGDXNqY3DquHP/VA6nz/hFUvHcAZ9SIZFJmHv wZMx7H8n5PCVSWqn4HowKv9S6QI+JE2zI3SCG3MVzVVniTL5gfZ0D6c1UyzYjFiSDgsw QO707v0zQy2BcDUxcdIyeYMWIfGHYjS/L9lvca8tbdVAjFfqUFdoQqfb//ISkp/Hajmw E2CfuKpCDasYeak3wbfShdgJK7DLQ624GLkmQAxJDOnu8K4M78npZl9m6kKGbGhj/OEh JoORMiVD1bJiYGj1kVD8avirfcKnZSAEiwuTyqWXOVjDcf/kphd8GYQfMzDRlQ0VE1xU hL1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718608394; x=1719213194; 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=b4PiFUbc5Z/4UeWoEg22x49vbzui05kVY5z2eOCt8Ms=; b=H3nLcRa7lKDUxyRlqHrsrc4Mi1YKf0VmC+vBXyS0PZPqTFmCPjNT3lIB6mOA254oXS xFZrF82Ghwthsirap1418jdJUokPecwNQ1q8Qspvw9mHRG3n3EjTcHKs8a+PWiJDiTzu zxmQb/u/JVJX+5AXg2LIKq08iD3z1n7ly5C040UiUIX9Do+f2/J5tx+Z2H8byiqD0CD3 8r4QdT+27Di7PS7N+BZMENsoZcpSU/k01kiQ7QCpW6NGibATevVmfJLFVXEijjmJS19x d6HarD++t6JILrpB4+bbIvqxWms1EJ3tijUEtoVl7TOfgWvCJaqAvO8244sueGLoxPGT myKA== X-Gm-Message-State: AOJu0YwJbX6THtUO3BdHq8mzRvAHvSfF8qDGAxeNfto7114261VFaogM nvVeAbE3BbSnfoiRUW1FfW6YLZldeFLz2qtDxjS6JaZWp4cUv8roba04fCeS3fMMGYP6uuNmjnS PR2o= X-Received: by 2002:a17:906:e0d1:b0:a6f:d1f:6469 with SMTP id a640c23a62f3a-a6f60de0ed9mr548939566b.64.1718608393789; Mon, 17 Jun 2024 00:13:13 -0700 (PDT) Received: from m1x-phil.lan ([176.176.169.90]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56da4158sm492709566b.16.2024.06.17.00.13.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 17 Jun 2024 00:13:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Thomas Huth , Zhao Liu Subject: [PATCH v6 20/23] hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine Date: Mon, 17 Jun 2024 09:11:15 +0200 Message-ID: <20240617071118.60464-21-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240617071118.60464-1-philmd@linaro.org> References: <20240617071118.60464-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=philmd@linaro.org; helo=mail-ej1-x62a.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 The pc-i440fx-2.3 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 Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov --- docs/about/deprecated.rst | 4 ++-- docs/about/removed-features.rst | 2 +- hw/i386/pc.c | 25 ------------------------- hw/i386/pc_piix.c | 19 ------------------- 4 files changed, 3 insertions(+), 47 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index d7775fbb84..ff3da68208 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -212,8 +212,8 @@ 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.3`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' These old machine types are quite neglected nowadays and thus might have various pitfalls with regards to live migration. Use a newer machine type diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 58821a8695..fc7b28e637 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -948,7 +948,7 @@ mips ``fulong2e`` machine alias (removed in 6.0) This machine has been renamed ``fuloong2e``. -``pc-0.10`` up to ``pc-i440fx-2.2`` (removed in 4.0 up to 9.0) +``pc-0.10`` up to ``pc-i440fx-2.3`` (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/hw/i386/pc.c b/hw/i386/pc.c index b0fc8686d8..819a164373 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -265,31 +265,6 @@ GlobalProperty pc_compat_2_4[] = { }; const size_t pc_compat_2_4_len = G_N_ELEMENTS(pc_compat_2_4); -GlobalProperty pc_compat_2_3[] = { - PC_CPU_MODEL_IDS("2.3.0") - { TYPE_X86_CPU, "arat", "off" }, - { "qemu64" "-" TYPE_X86_CPU, "min-level", "4" }, - { "kvm64" "-" TYPE_X86_CPU, "min-level", "5" }, - { "pentium3" "-" TYPE_X86_CPU, "min-level", "2" }, - { "n270" "-" TYPE_X86_CPU, "min-level", "5" }, - { "Conroe" "-" TYPE_X86_CPU, "min-level", "4" }, - { "Penryn" "-" TYPE_X86_CPU, "min-level", "4" }, - { "Nehalem" "-" TYPE_X86_CPU, "min-level", "4" }, - { "n270" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Penryn" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Conroe" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Nehalem" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Westmere" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "SandyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "IvyBridge" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Haswell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Haswell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Broadwell" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { "Broadwell-noTSX" "-" TYPE_X86_CPU, "min-xlevel", "0x8000000a" }, - { TYPE_X86_CPU, "kvm-no-smi-migration", "on" }, -}; -const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3); - 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 1343fd93e7..217c749705 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -421,14 +421,6 @@ static void pc_set_south_bridge(Object *obj, int value, Error **errp) * hw_compat_*, pc_compat_*, or * pc_*_machine_options(). */ -static void pc_compat_2_3_fn(MachineState *machine) -{ - X86MachineState *x86ms = X86_MACHINE(machine); - if (kvm_enabled()) { - x86ms->smm = ON_OFF_AUTO_OFF; - } -} - #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { @@ -827,17 +819,6 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, pc_i440fx_2_4_machine_options) -static void pc_i440fx_2_3_machine_options(MachineClass *m) -{ - pc_i440fx_2_4_machine_options(m); - m->hw_version = "2.3.0"; - compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len); - compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len); -} - -DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn, - pc_i440fx_2_3_machine_options); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) {