From patchwork Wed May 29 05:15:32 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: 799819 Delivered-To: patch@linaro.org Received: by 2002:adf:e110:0:b0:35b:5a80:51b4 with SMTP id t16csp567301wrz; Tue, 28 May 2024 22:18:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWbk9PF9TM1975cZ8/2a5FVrR/OjrKXA3RcNBj+Scz3D9yvC2YLri88/H/eQefRUysTOE4Nzz086ZIL9Cndez+H X-Google-Smtp-Source: AGHT+IH0jQNJiZc0qlBMpCKzVPl7jciWClCCGq/jL7c+xj9UKMcxxfOTr0wKimLEOR8BVJAUHiu9 X-Received: by 2002:a05:6214:2c01:b0:6a3:2949:c496 with SMTP id 6a1803df08f44-6abbbc8cd28mr162389716d6.21.1716959924209; Tue, 28 May 2024 22:18:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716959924; cv=none; d=google.com; s=arc-20160816; b=P1HermH3tt1F76+aBDPvnkZxbp8MOkGIXVZ3/yk4LMx6if/ps2eBKuMV+acDegkTIr 2inPiGhOHYwj+NYDWBsl6Yh29z3QvZNgyFOU7iVjK90xhKHfLgsT3XpcUtI8pjLhXcVk wOSCIKwu7RryI4oYL8tl79GEPvJckqOnPmB05l6/rd3bNrZvMeMg5o40yyu+cBktUsaZ oq92GifpN5yv1LcIJAytROwbiq4z95zOgDnmtS3xfJ8lSVBmnTR2AkEgcb8xNNyAdSIt vTzgI9qv2Kw30WaBZNHS6+e3BQbIxmy/1FIt2WLpnpKHayfJKc79DKhz/ffL7bMSNZmh W5hQ== 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=srRkm9ae2J9ZTUMkjf3HvKLm6bgUuxUXvAdMOqZAvf0=; fh=oSujGHGU6kAtfrTPSJ+sLUg/jC0/xSWRKBD061WPWBw=; b=B2D/3cMOYhvVjD4c44io3SGKzFsNQVCSo6/SE7QAoog1TCK2yE+heuU1Traq7LForO /rgBzY0qAF/NnL6AcgsafiBasWTvPyha2L71nC46a6clRHVPpXGr5mol1miOfUFuceJC 75tdhI9LAGZl6f6seAyd9wh6Yj87Rm1k+cvy3gJdL1us3s59Hltg3kTn7Bx6+wf2VFM6 vUiAmJTvIKzZi5AbnFFevllBOkGqobAdKquIYwQ6sgGAugZ883vub4ctXPM0MT2tVPzE y3KUASS83w40VKqlUXFooaWiTqgPWz0+ZOBs7qZ6ZkU+gTz+UAyh+RyxS4gF/wdC4iRe ejtg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LZIQlmJR; 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-6ac070f306esi121236086d6.250.2024.05.28.22.18.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 May 2024 22:18:44 -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=LZIQlmJR; 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 1sCBgl-0002C6-Ir; Wed, 29 May 2024 01:17:30 -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 1sCBgV-00020S-TZ for qemu-devel@nongnu.org; Wed, 29 May 2024 01:17:12 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCBgT-0005Tk-VH for qemu-devel@nongnu.org; Wed, 29 May 2024 01:17:11 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-354fb2d9026so1542004f8f.1 for ; Tue, 28 May 2024 22:17:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1716959828; x=1717564628; 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=srRkm9ae2J9ZTUMkjf3HvKLm6bgUuxUXvAdMOqZAvf0=; b=LZIQlmJR5emirMDgata8LYtMV2R0o6z4ckhphVl+j9uqrQ76f0wiqCXJsyDuWS0Z/T NlC4NoEPWGl2M6agNIIrQV/kCFscxUHEOE+Vmp5owNzp2qfymkiRHOwIl0eAhMywXQJT qLyW7BrCBb+moN2FV0bRiGdN9fj7GHDI9lu284dkFDvKE2sr65ECIsvIJV+Jq88DctSV Z/PrfhVunJjYMprL7Ih6T/iuqmiJRweDniYo5txAIYi9Qh8Y0QPl3oTlmMQqNb255xUS hGSpfiMSguW9CLKvOoXyyuesT9yDVdLogCJdy6Thp9FuQxQNEPuNvEqv0e4sjgbZNzBm BBVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716959828; x=1717564628; 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=srRkm9ae2J9ZTUMkjf3HvKLm6bgUuxUXvAdMOqZAvf0=; b=tEI38WNP8DMWuePDHBiWnrsoCM+hlblmujcPHyjyEnqCh7GLgM8DM/qXg2ouecDu+V s+eBQeJLQbVVFCtkOMeBKf1G3e8h5AtfC3FEUTRSemp1DhwQgneKJT7EbPVckrbdbNsK oi6cw0w4eYveSdMgszunw2FFz7u5oE6mvvCgV0WkR7T++KfIQ3yqziZXTl81ZzboT9oW k1Ngshbcj0QPA55JexLYjFn4TyfLcwTczG4qo/MVpUzIqvyJGl90C6J2E3NVeZXfRgXM 5sGBm1NfQsnw1Ovtm9U5D33xTuiXGq+UpeSnYXKBt1f2wdy3mVqRSqaKKQV9h+EMSIiY m1sw== X-Gm-Message-State: AOJu0Yz35bi52De7ddmLodnS2Q+10HdH1Yarmd3IJvLK8YCEd86jXhBR iRD9H8TN6n/VHc1DwHrmP/J4SX7XjLDBfRNX/dquMgqnIzx3hh4faDrMm0gEXcT7LwgaM67f+Gs B X-Received: by 2002:adf:ed8f:0:b0:354:ddb8:b5e3 with SMTP id ffacd0b85a97d-35526c15a10mr9023854f8f.11.1716959828135; Tue, 28 May 2024 22:17:08 -0700 (PDT) Received: from m1x-phil.lan ([176.187.204.141]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3557a09090fsm13628170f8f.54.2024.05.28.22.17.06 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 May 2024 22:17:07 -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?= , Zhao Liu Subject: [PATCH v5 16/23] hw/i386/pc: Remove deprecated pc-i440fx-2.2 machine Date: Wed, 29 May 2024 07:15:32 +0200 Message-ID: <20240529051539.71210-17-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::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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 --- 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 5b4753e5dc..0fa45aba8b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -228,7 +228,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 9b0e2f11de..5d7bb4354b 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.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 1351e73ee0..996495985e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -279,9 +279,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 c7d44420a5..ccfcb92605 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -289,29 +289,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) {