From patchwork Tue Jun 18 15:59:42 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: 805269 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:144:b0:362:4979:7f74 with SMTP id r4csp276151wrx; Tue, 18 Jun 2024 09:11:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUwWgrNl5HgI73Y8HLjtTdHX4iWppouKe3tAgGpV5XR25fHw8/+bHjQakl3o8ZqohCNRwIjes4hxZKa9APv0fX3 X-Google-Smtp-Source: AGHT+IFutfH+h8sYmus/9TIHXbJNf2P4VLXc+pVzOK9cuBCnxAcx3BBbLlOuMeWSlgm73B42/VB/ X-Received: by 2002:a05:620a:244b:b0:795:5ddb:cf9b with SMTP id af79cd13be357-79bb3e2e535mr15638285a.17.1718727102286; Tue, 18 Jun 2024 09:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718727102; cv=none; d=google.com; s=arc-20160816; b=IWbeawIbUMYFGPAIpBw48V1xsxp7hac1/xuMsaF8VOo+dBj0cUXer3vJurjfvFS7EI brzA8L88511UIUY0YBDPDoIUQZdQiPtS24e9qRYqdUCzXwSJH89UjQ3tV9xhDiF3l90Q Aoo3H0K+/emdkmVHIcc/87HbAVKtuLXBWrPwk5GfHYTek6LT76jVszliG8H5swX7xu87 q5ozBZpjEItFMZgCjK1AlJJjLL+TwB8ZA20dHCchG5fScht01lJRCUp4X+Y4F2OCs/gv gpza4e8ACTg6QQndQwswBmTy2qLstwNqo150XMdlqzXFT3ykdVFq4kUIUPLBeSPzKYIw Kvhw== 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=xlqTA80CTKBhUFfHICeuz396Eu90w2khPgPyIhgyZ5Q=; fh=QeIS5kb1Uh2g1z6dWJxoYMIPD1Pl4adL6YUWYeE5yJk=; b=R1UKlqzfy07hKR4kPPt4D6EXAjIzX7Y4v7YKqbR/da3Os75hOlpDOHIKguV3Bt/GYT zq2KjtoEtlAxbMW/P9/ULIHbh+b6RFzNcD0B+1iCpNnUIb8h5EFFqu7BqaDUY8qfI/y+ 8nR9bf0fX5IBTKruMmpYZK2uRirVFcWIgWnjriVrdfnLV6tfwk3b0wvD49grJVLaM+Rd 5Ic6xO5sD9pn3ng65v11PKEvP4RJ9C5njyfx3PO1UfC2RdPKwMDigVSZ36v1EcFMH7dP 3NyotgSItvG9rL2C18utKD9tcxCrSkJkqIG2Lb5mBDqSh5/lAPZJ5maOHZJoelaeYqFD c+hw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=glnNNfuF; 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-798aac9bebfsi904501085a.98.2024.06.18.09.11.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jun 2024 09:11: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=glnNNfuF; 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 1sJbIW-0006sF-FJ; Tue, 18 Jun 2024 12:03:04 -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 1sJbIC-00062g-0b for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:02:45 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJbIA-000713-6A for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:02:43 -0400 Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a6f1da33826so777005866b.0 for ; Tue, 18 Jun 2024 09:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718726560; x=1719331360; 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=xlqTA80CTKBhUFfHICeuz396Eu90w2khPgPyIhgyZ5Q=; b=glnNNfuFMt2Qfn6RDAf4XO2Y2Dci4184Q+4MI2V3kvgfYyE6vyKXJH8bBr/0FGfPfF osP+rMlXVJmW9NtBSmsQqEvguo5HRL/7bCc8XHH5W+UdrDUma2gD1K5K3QcfFSUUtHLn +6wf9+Y8Fl7fIU8lEc/YZUNkjPfrbpT20wooAhcRr5aID45YfUg+7aGd9DYExxxId9+3 N8kccz20d0wcgy066I1wvaL1DcVJxGPHPLihLJpSGqDVkUC4IUGHBl9dX22MKeyiG6nA Zqgj6NR3mHrJcauxl8SGR2Zlm5Fkki2WQEHcZDnfLGGP0Ow0ncWi9UssGVn0b3JafI/9 O/pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718726560; x=1719331360; 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=xlqTA80CTKBhUFfHICeuz396Eu90w2khPgPyIhgyZ5Q=; b=d21kxoaIwdOTwOuCRDdGuK+AEVJ9OzBfFHedmuD+XkYNrQhtCFQGq3n0RWOsOMPsCL 5+K/Sz8j1PvDAhf1NvofS8BGr7u87M3bClAkCnSN6EiIY7l6Iiat1fY8YNyvRWHwjGpy 6Vn+99IHthYDlQYpJaeMib9lQnkxd3FcYkBX7OTAmxQC4qBrGOKtzSV67k0ALS7NTbZV 94BHsSOtCeyaarWa2BRWsc3Odzdsiud7fXzRr2/yLjKxG9nEI4qvS+2yeyTOoovMRq/t jPh48ORCkxOUJ/+CxhnscPl+bUGFFws0iiSnYGHk7+qIdI15qmwpuS6Y7Zr4GMc2W25y /sjw== X-Gm-Message-State: AOJu0YyYYT2fw+256qUfEGjGRYFvMgDHAvv/Mru5baoXfWXcQZ3q3xQA seaTTf4sxkI12VNhWfbxrk/Cydv7DlkcfOudN72E6kIwfapslTaLU7dc+4hBmAPQX1febJhT/// X X-Received: by 2002:a17:906:c2cc:b0:a6f:5eec:37d1 with SMTP id a640c23a62f3a-a6f60dc509bmr938967166b.62.1718726560414; Tue, 18 Jun 2024 09:02:40 -0700 (PDT) Received: from m1x-phil.lan ([176.187.212.55]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f6a1f2cb9sm500182066b.17.2024.06.18.09.02.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Jun 2024 09:02:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Zhao Liu , Igor Mammedov Subject: [PULL 20/76] hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine Date: Tue, 18 Jun 2024 17:59:42 +0200 Message-ID: <20240618160039.36108-21-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240618160039.36108-1-philmd@linaro.org> References: <20240618160039.36108-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=philmd@linaro.org; helo=mail-ej1-x631.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 Message-Id: <20240617071118.60464-21-philmd@linaro.org> --- 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) {