From patchwork Wed May 29 05:15:36 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: 799815 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp567025wrz; Tue, 28 May 2024 22:17:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJz/WG71k4SsYkqmcQWCDHYJGzwupokmyvG3gSILm6ur/WsOAWZzeQ8KSwaDzoFuIqFlM4ghCIIcnmCYr+iR41 X-Google-Smtp-Source: AGHT+IH8OIpmb0fekuPIHy449YxIYtxyE5KKR/E73JcCV0kLYUFKtaSMc6BqYwBmobrq4vYo3E7A X-Received: by 2002:a05:620a:3c2:b0:792:9652:5a1d with SMTP id af79cd13be357-794ab11204amr1486771585a.66.1716959861970; Tue, 28 May 2024 22:17:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716959861; cv=none; d=google.com; s=arc-20160816; b=rwNcBaCfL3nFTPcW53HZNTAzJFx3WAkQVRxC+rXKKO127QUy3Iht0JS/bUnBSkc6Um Pl2cRo0T17P7DxB7eCVm+bXNn0OpoNE8mt9PCnYa2UYlnsSwvryyeDT9XOagbTNw+pki JZOs8IgHAc+ndt6OW4/Z6FXZwRTNWaXwZwx15gq97Lq26mqw9VQz/gbdgziF3+YfJmsE I4NWFR1yFFOIbPnkVYBcHMMSqJQSBXtrzKodKlikdTY6sn3HpcJOdVfnHwwZw7WPSbdz 8UVst5+n1ta2CWHB4hz4aIc4XpV0ZEZHg8hjyAN5baqodb/CqDnOsy6qsTMlXHEGWzb6 HdHA== 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=nzOkK/6FwavJEbHE1R7du1oGmMgzpDdcDl3/igK8u5I=; fh=ryOjcwI2P4fZLQ5py9AggSqqY7XAzy6e50f2zsemJME=; b=bbk/l7PWlQmjEjOY4zphLu9nX7Nu2HdzUjPoVJEgEyLalxENxOTAUmsTSfKdCJkoaq F6w2W8WDEEHVFyVRDtHLQ5kJ8BywigKW2BZA/CxiBPXuOGMlG4YUzTmbYJ2UxVVrcJpD Ym/O28wpfo6j713eFPZ4uPaMRg2aJYxID2Fv6H1Q2QClpEaas2MQGgWHSrITWcTXe+8f 7muHLTGWyO8bnRGfbdAiatUDP6xKT1OPCMhZqLBHazaeH/4uUK1Ordzt2Y6vQkcNfw+n chao5Q1ScI/0jOzdJfiw+WmdJEZjA8SXtRgITz45S8jw3CfRdOsuGD6hZNfYb9SWGYNU cNug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RaGfaNad; 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-794abd61117si979514085a.762.2024.05.28.22.17.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 May 2024 22:17:41 -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=RaGfaNad; 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 1sCBgu-0003Qz-DK; Wed, 29 May 2024 01:17: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 1sCBgs-00035h-Cs for qemu-devel@nongnu.org; Wed, 29 May 2024 01:17:34 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCBgq-0005WV-Ag for qemu-devel@nongnu.org; Wed, 29 May 2024 01:17:34 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-35bf77ba951so972384f8f.3 for ; Tue, 28 May 2024 22:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716959850; x=1717564650; 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=nzOkK/6FwavJEbHE1R7du1oGmMgzpDdcDl3/igK8u5I=; b=RaGfaNadTRSUc4VrbCowMDVFFbiCbVST0MCUCLHQVsi+lu7+5Asc1kWFkqki5hwDAZ wcf6xY8GMAfAbLEFMBxuTMqZdwW23ccNTbBhs+e5F9LACV9DQXeXW+eehOQFze6niKl+ M1WuuStwyWLLDWml6GByJPGww6eJ3Rzy9MdbmgTjAuVOBn1AQQuEtFNqJCuxe99mH/gB 07JDPJGWCdnwLCCGO+0fw/xcwlT9tm1eoLs1qHW8Bt97Deb2S4GauH7SPNxTFE+PPWIf 2ZrPW8OAg6EixREGEhNEGDuaytb377ctKzgKqFw2IN8rxRvdA0sTckxgwtnuyMFuNAIa yHpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716959850; x=1717564650; 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=nzOkK/6FwavJEbHE1R7du1oGmMgzpDdcDl3/igK8u5I=; b=FhsNLR0U2Iq9NO4uldpTgdIBgouQpTvOGvxz6s/xVmVPUAqkolRvNU8fai57sfJENI RXNOoDzv5XbuZ1/6gMelQ0NbSWF8EAeFy6CpovGs/7MrxwQ+pycLApHaflBXLdPqNjfD ayJiTJFOGy+vyx4emTgJDZ4R42M3Rxg91QOttMAcNOt3F5Sf7hVK/kBbU/sFWQv7kAvC Xudiih+w+LSTu34Bx/iPr93J0NWD9GWNvBX7i6OMDGcM7sNbkZM2YRMpxceLaLifwzRm vwdQYvETS8sPdH1ipoZtYL+tiLkt5JRECgIGH1uyMi4QB2Hw9R2nlivxvzuWoFVdG95X qf0A== X-Gm-Message-State: AOJu0Yz4BQviJvS1/Ff+0Pe2U3h2yhIUWUhnJNOfnwWlNpoCwmwBHhin GR/hn3+mu1B+eVvmT3GE387Sjr3z8hpesUeyo7UcIV7if3WX2j6RHxLRrn6CvFl/aIFm8X2lAs5 U X-Received: by 2002:adf:a1c4:0:b0:355:3cf:49b1 with SMTP id ffacd0b85a97d-35526c6bce0mr8945244f8f.19.1716959850419; Tue, 28 May 2024 22:17:30 -0700 (PDT) Received: from m1x-phil.lan ([176.187.204.141]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f64f98sm194102775e9.24.2024.05.28.22.17.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 May 2024 22:17:30 -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?= Subject: [PATCH v5 20/23] hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine Date: Wed, 29 May 2024 07:15:36 +0200 Message-ID: <20240529051539.71210-21-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::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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 0fa45aba8b..3d004a0818 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -228,8 +228,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 5d7bb4354b..2cbbd03cfd 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -925,7 +925,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 8e51d1f1bb..b84c8ddba0 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -264,31 +264,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) {