From patchwork Tue Mar 5 13:42:14 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: 778013 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c8:0:b0:33e:474f:8c56 with SMTP id p8csp438782wrs; Tue, 5 Mar 2024 05:44:41 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU+oc79mJWNVHXZW3lwnoiIk6rauedMY0MaCCy6ecbg1l6MU+uC8XXYDaoPryFB7Sfkcr7lIxye1cNBjuU6eB7V X-Google-Smtp-Source: AGHT+IHaX7/6NvNNy/tiLUt1lMBYvzCeZFVt0oncz8/RUkVXpzKVW8CzVIpCcHGrMSW+VSe5H0C0 X-Received: by 2002:a05:620a:214b:b0:788:848:e514 with SMTP id m11-20020a05620a214b00b007880848e514mr1881854qkm.71.1709646281481; Tue, 05 Mar 2024 05:44:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709646281; cv=none; d=google.com; s=arc-20160816; b=e9qSTesi2BhoU7w7fXxCngB8/pXWC4JK0fc0Q5lFztfi3na32tjMI/5B4eA3+JVlhx 24qN5LC4mzNsmpYjfigMNerLKEXhR1L0Y5JP9JLXoEqBEzGLeMYjavcD7wLdanjjM1mh ExMeAbfjk60f6O7HukW8+Ht/MjWARj3BFPw4UHOmTI461et2PUxOv7obSifgvrBV81ar awe2LOf9CyZU3Mwx5PALyJxqcvYOeqXVq8irS/qrTpbmIX0xvwZ1ph9o1wmfETu6Sdlo TkfIdGB95cgBWe/rAjYw6nw/CBqGesrAJWdOQm4EXXyFW3Io0bc8RfFjtyBLA6WAalyw rV4w== 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=crLnBPuyRmvWsoYI1VEnIHyayJ9tujHUtxXmAXPz7S0=; fh=lA6yvtwEvDsoPmbdvRiSkKi1PbIkmvp3T23nqm+dAas=; b=uX+un0HT0k6zIF/1UaHfYxkq23LlGpEHv++QqVdkh9FbEfYSz0CxXrN7Y9tPmcPxUd u2GNCQQt7+/Ivxev7jndOgYf1uDsw2sspeIQvBsJ/AH3fI1P3ocq+R5R+B8cg4/jseeq 8ADM50RRPxvrWPCKevVJBNQKY+UyTsrcjbASb15g+SHJrgOBiCc8uGKDvCCPjtF8UkWj tyTz71JqhA5fG+zlatflMlam0ljIjFHcdGrVnAWNXwWmuCbefiDs4ZKnpC6fiuwu1Zoi zj/3oFAPTYasi8u9TtniRXtHz0uj1Q8ZbRUdVAL6vqgo4OTtXUVAOZ6eJCgXDjJmRntW m2XA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dVA8r0/T"; 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 bl38-20020a05620a1aa600b007881f509f0bsi7411962qkb.402.2024.03.05.05.44.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Mar 2024 05:44:41 -0800 (PST) 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="dVA8r0/T"; 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 1rhV5d-0003vw-L2; Tue, 05 Mar 2024 08:44:21 -0500 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 1rhV5G-0003fE-HN for qemu-devel@nongnu.org; Tue, 05 Mar 2024 08:43:55 -0500 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhV5E-00049Z-6X for qemu-devel@nongnu.org; Tue, 05 Mar 2024 08:43:54 -0500 Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2d3f962a9dfso2855181fa.1 for ; Tue, 05 Mar 2024 05:43:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709646230; x=1710251030; 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=crLnBPuyRmvWsoYI1VEnIHyayJ9tujHUtxXmAXPz7S0=; b=dVA8r0/TOOhJELImYaE9yCssjFlY9exhc7uUhaN3X2j3C/CpuhikXvpWXWBSX8isCW oqYB6nYCyvQ4HdYHBKW41N/WN7uGaHx4G/xtyLCoVYl6JKMrr1VkjQ5fl3rc9+MGQRH8 Ue1MvdZtYWa4RyjaHOuUgbv4LUQnhe9m6901FARptMdqi8FNW8wtpXLOiHqJ082AweZI qT0PemFB4Vyx+wI05y2Ote4n2WGzBSJtORDRhN+Ez6FyzJiZmJrzXlFmU5+RRixkrAcw sfUcYaa8ERNJsa81OxHtpTdcCVo2QlvjHdCyXJ1a3+IJ6s1j4xgQoHFgl/NA7S3TXB/Y l6jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709646230; x=1710251030; 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=crLnBPuyRmvWsoYI1VEnIHyayJ9tujHUtxXmAXPz7S0=; b=aKD15vqBY7KF7Zqjbfw3n/eSzMOV538PScaRtyK4xYxWlLmjNfiTRfLKWWIcH5/nje Q4tNxn9ruTv4LW96Fy86/jLQrAAo0T3KK4bagbcH2cYMEvsIUvfUwp3ErBZgXXLJvjNB Y545hwnz9M5mLELaG/uzs+Tz0ilzDQ+phzk+UwMBVGH0Tww/NhCe4P05UtzYHDQpsbMT K3gNVqVu5t5Z9Kd19JMFfYHU94yG6Xx2EZJRQFg85RRWDHPOy5Q/Q+qQVhJix8IJGVrD wBIRoezWN8O2Ioy7imeHcAnGNi1w7rCu9tSBlNQkhVeZZeKUg8TYMtZNAqpzXsz+LWrU hvOA== X-Gm-Message-State: AOJu0YwOBZxLY2/GJnhrWqNyGfZ5cyOsOiuU+rvPyZQmKyf1890BTztv V856YC0aciUxYmpto1AXGwF7rAGqqCyzmzqFDPKnMIhF2z/jBi/BB37scr7ose7pij3Wt319zFZ X X-Received: by 2002:a2e:b0e5:0:b0:2d3:ba52:f878 with SMTP id h5-20020a2eb0e5000000b002d3ba52f878mr1364796ljl.0.1709646229749; Tue, 05 Mar 2024 05:43:49 -0800 (PST) Received: from m1x-phil.lan ([176.176.177.70]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b00412b643b5a3sm17863110wms.11.2024.03.05.05.43.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 05 Mar 2024 05:43:49 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Thomas Huth Cc: Igor Mammedov , Richard Henderson , kvm@vger.kernel.org, Marcelo Tosatti , devel@lists.libvirt.org, David Hildenbrand , Ani Sinha , Paolo Bonzini , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost Subject: [PATCH-for-9.1 12/18] hw/i386/pc: Remove deprecated pc-i440fx-2.2 machine Date: Tue, 5 Mar 2024 14:42:14 +0100 Message-ID: <20240305134221.30924-13-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240305134221.30924-1-philmd@linaro.org> References: <20240305134221.30924-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22b; envelope-from=philmd@linaro.org; helo=mail-lj1-x22b.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.2 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 --- docs/about/deprecated.rst | 6 +++--- docs/about/removed-features.rst | 2 +- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 23 ----------------------- hw/i386/pc_piix.c | 21 --------------------- 5 files changed, 4 insertions(+), 51 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index c68b17df23..84c82d85e1 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -221,10 +221,10 @@ 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.2`` up to ``pc-i440fx-2.3`` (since 8.2) -''''''''''''''''''''''''''''''''''''''''''''''''''''' +``pc-i440fx-2.3`` (since 8.2) +''''''''''''''''''''''''''''' -These old machine types are quite neglected nowadays and thus might have +This old machine type is quite neglected nowadays and thus might have various pitfalls with regards to live migration. Use a newer machine type instead. diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index d01b0afbef..c2ec08f56c 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -801,7 +801,7 @@ mips ``fulong2e`` machine alias (removed in 6.0) This machine has been renamed ``fuloong2e``. -``pc-0.10`` up to ``pc-i440fx-2.1`` (removed in 4.0 up to 9.0) +``pc-0.10`` up to ``pc-i440fx-2.2`` (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 bf1d6e99b4..f7a5f4f283 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -274,9 +274,6 @@ extern const size_t pc_compat_2_4_len; extern GlobalProperty pc_compat_2_3[]; extern const size_t pc_compat_2_3_len; -extern GlobalProperty pc_compat_2_2[]; -extern const size_t pc_compat_2_2_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 ea7b05797b..a762df7686 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -281,29 +281,6 @@ GlobalProperty pc_compat_2_3[] = { }; const size_t pc_compat_2_3_len = G_N_ELEMENTS(pc_compat_2_3); -GlobalProperty pc_compat_2_2[] = { - PC_CPU_MODEL_IDS("2.2.0") - { "kvm64" "-" TYPE_X86_CPU, "vme", "off" }, - { "kvm32" "-" TYPE_X86_CPU, "vme", "off" }, - { "Conroe" "-" TYPE_X86_CPU, "vme", "off" }, - { "Penryn" "-" TYPE_X86_CPU, "vme", "off" }, - { "Nehalem" "-" TYPE_X86_CPU, "vme", "off" }, - { "Westmere" "-" TYPE_X86_CPU, "vme", "off" }, - { "SandyBridge" "-" TYPE_X86_CPU, "vme", "off" }, - { "Haswell" "-" TYPE_X86_CPU, "vme", "off" }, - { "Broadwell" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G1" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G2" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G3" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G4" "-" TYPE_X86_CPU, "vme", "off" }, - { "Opteron_G5" "-" TYPE_X86_CPU, "vme", "off" }, - { "Haswell" "-" TYPE_X86_CPU, "f16c", "off" }, - { "Haswell" "-" TYPE_X86_CPU, "rdrand", "off" }, - { "Broadwell" "-" TYPE_X86_CPU, "f16c", "off" }, - { "Broadwell" "-" TYPE_X86_CPU, "rdrand", "off" }, -}; -const size_t pc_compat_2_2_len = G_N_ELEMENTS(pc_compat_2_2); - 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 88457de0f8..e5a2182211 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -429,11 +429,6 @@ static void pc_compat_2_3_fn(MachineState *machine) } } -static void pc_compat_2_2_fn(MachineState *machine) -{ - pc_compat_2_3_fn(machine); -} - #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { @@ -824,22 +819,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn, pc_i440fx_2_3_machine_options); -static void pc_i440fx_2_2_machine_options(MachineClass *m) -{ - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_2_3_machine_options(m); - m->hw_version = "2.2.0"; - m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on"; - compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len); - compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len); - pcmc->rsdp_in_ram = false; - pcmc->resizable_acpi_blob = false; -} - -DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn, - pc_i440fx_2_2_machine_options); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) {