From patchwork Tue Jun 18 15:59:38 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: 805230 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:144:b0:362:4979:7f74 with SMTP id r4csp273575wrx; Tue, 18 Jun 2024 09:07:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU8WMWn+iyPy5WLLqRBbb0OIQXEiMb+Mf7UjDnfz7upBPyb9+oHB/H0HQ5S1sQsLqq/U+Jd9TP5qq9uNe+F2/SY X-Google-Smtp-Source: AGHT+IFdO1dIvNQrAd4XTFigOTlSJevZRjl7EtUbVi4FUv0JfknqTvg7MpDjx2g+QG6JxrbkDKv9 X-Received: by 2002:a05:6358:70d:b0:19f:424f:d06b with SMTP id e5c5f4694b2df-1a1fd59abd2mr24549255d.28.1718726835270; Tue, 18 Jun 2024 09:07:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718726835; cv=none; d=google.com; s=arc-20160816; b=VBU3eU8d8X71rhwW7SoBMYnpxVuUlBT9ItKdjYsSWF0ItmiO6qAZn2gbhjYuJitUR5 4XgQ7ah1ZGdQAatrhksqZfIgIe5K9sp2pGN23phSt0AR/cksNIeStrDxqUp5NjfLGhsF qJ37lJt/8TVG0/RRx+RoF4oi3gYY7EmIxmimTo4JAtrdVFCxkfj5gv9ZX00NLjrnqTuu jEWm9N3GRCo4TwIBj7dZi/503zDOG270BIXvEbA/+RFC9Wrhaw8YCaJEMUMnBbjfbWdE Ialg6yJBMBZsDBnUpzWlgiW6hN5tFX96naP9khswGxaKMO0jxY0cLvnmsDMTabh2hA68 UboQ== 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=aMAO3xHfioEXwSz2+k/2XWVP8HfNnIoa40YXW/We34A=; fh=QeIS5kb1Uh2g1z6dWJxoYMIPD1Pl4adL6YUWYeE5yJk=; b=Z8x68MHkYFNBYfCZv27RiUtnsF1+VX9rpasIu/YVAEyGx743Bbypk3oWfc3g7QFhj8 7l07jml5SV5lSS6zvqbuqxwi8cl5zF1v8b3mXnGCOZru6YRa3D6sEJWVbmrz0LPTEVJV FhkIQNWci1XKLbiKC/i9+rVUAOlUoO/I9IqAf9lJ4uhIrelmJ6PsZ4GU4Tpm+EiT8y+k sG5ocONqkM+swIgZCqSPR71gSVcRDxmyXQj5sQHpymr2tdto3xkXY1gDlt719wwAk/l2 nJWF58PZbO8odW7OcmL5F4omCc1U0bR4lL09JOp2J8p2c5P6AWuAX6CDNAmrMqSASVsj tHCw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IcOR1H7z; 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 ada2fe7eead31-48da4471d1csi2276900137.353.2024.06.18.09.07.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jun 2024 09:07:15 -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=IcOR1H7z; 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 1sJbI5-0005fu-8P; Tue, 18 Jun 2024 12:02:37 -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 1sJbHo-0005Ti-Qe for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:02:25 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJbHl-0006wj-VK for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:02:20 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-57c75464e77so6949629a12.0 for ; Tue, 18 Jun 2024 09:02:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718726535; x=1719331335; 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=aMAO3xHfioEXwSz2+k/2XWVP8HfNnIoa40YXW/We34A=; b=IcOR1H7zWFyj5nFS9gptEndl2JlKGHgl/CU7HDfapFVN5TV0DF9dH1ZQEBWIyMGCIp BCmZA02n4LnqypQ1CsF/DLDT08fUYdg9veTeMyeAI4dhMeMZhowS4ninWUaqQIN1wdQ8 DAiwgLj0/0SNYMMKsmyU+Xv/oTHaiquPqUmmj3g7N8TXZwQnUUKsmOLQuHDObGS3PH+T r+OH/UWiESVNN9WuMHxq/ELisy0eIxuX21YwKCAdI1uy0x6/UXVvGBpORj7OS0ql3uLm 9yw2EPVcMj3f7vcSJPxolpqKpuEsrbAHGR/MtPQ6mDAgu+mi4jNh8yKgT+s68OiP8hkE f+SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718726535; x=1719331335; 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=aMAO3xHfioEXwSz2+k/2XWVP8HfNnIoa40YXW/We34A=; b=sTSq1j6fVDWzeQ8HNoZ/+29cdpfUVPM5BMib5uWULt3UgSwHPmzs9T0rtwO0zNoW1I oTKJQDZj3Nqioe+l4k/K7sEccEd3VuMOwchatmZNd+HLROuiBTOu3q0z9e62G1mTWkso TfcMPCD4+V0J2G8F83I2viwVz4YF5iCh4vjd8e+iWf+XGYDLE2k1256y1Rn+MXTtwFwd lUDrCQOe0OnQM6OQ3tNnBYYxzFW3etBs7+THOmq2gGCdsSWJ7iIgqSovAInphzKnCOS6 t41unWaQP40i/87bAPgol6pCM24Ai+GXlpST+FzEqX0GINYzl0CqF0JBeguF/ghhHQy4 0CoQ== X-Gm-Message-State: AOJu0YzdPDlIV9OcxSLt/wGXCo/zk7+amDOg+ucWa6GSqpP84+jbaO1K uKY3nex/D1Nl/YZnljwysTAjgGD1Jr/tZgpuCxgfjZSvnEOxdSIRrwZWWSwBtKQHrAnijF/J2T8 3 X-Received: by 2002:a50:bb4b:0:b0:57c:f091:f607 with SMTP id 4fb4d7f45d1cf-57cf091f624mr2984177a12.29.1718726535547; Tue, 18 Jun 2024 09:02:15 -0700 (PDT) Received: from m1x-phil.lan ([176.187.212.55]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57cbc2d4b0dsm7123083a12.33.2024.06.18.09.02.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Jun 2024 09:02:15 -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 16/76] hw/i386/pc: Remove deprecated pc-i440fx-2.2 machine Date: Tue, 18 Jun 2024 17:59:38 +0200 Message-ID: <20240618160039.36108-17-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::52d; envelope-from=philmd@linaro.org; helo=mail-ed1-x52d.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 Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov Message-Id: <20240617071118.60464-17-philmd@linaro.org> --- docs/about/deprecated.rst | 2 +- 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, 2 insertions(+), 49 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e332eb46e9..d7775fbb84 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -212,7 +212,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.2`` 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.3`` up to ``pc-i440fx-2.3`` (since 8.2) and ``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 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 347e04e50e..58821a8695 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.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 ca72f8cab8..155a02b1b5 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -307,9 +307,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 8a9c025754..21a9b7a5ae 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -290,29 +290,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 e0b421dd51..1343fd93e7 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) { @@ -843,22 +838,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) {