From nobody Tue Jan 21 03:57:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1737109708111378.74976011709236; Fri, 17 Jan 2025 02:28:28 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 382C31A03; Fri, 17 Jan 2025 05:28:27 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B66711A3D; Fri, 17 Jan 2025 05:28:08 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 2922319A1; Fri, 17 Jan 2025 05:28:03 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 34E8019CE for ; Fri, 17 Jan 2025 05:27:55 -0500 (EST) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-338-_NgbYu_IMEKbXsXX9N0_Ww-1; Fri, 17 Jan 2025 05:27:51 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A77751955D8F; Fri, 17 Jan 2025 10:27:49 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.246]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2E76F195E3E1; Fri, 17 Jan 2025 10:27:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737109674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ysEtvbwR2oM7KzpPPmqWFHrBhbWKMWCq5lzJWnFKaRo=; b=LC2LfmKF9o0b7poJTiOEcjD17bDMYu381u4wO+SN/ayX1IxKkJkPqP1gY6Cp8U/wwuLrdL czI41ne91k27aL8dsU8W9Qn9xKWtVPbWaxUjkGoUcDnujufvMWPUKFJzW4qhVWkZdwttsv U/9873xaN5OlS/2a0W0eLYoUGG3LItU= X-MC-Unique: _NgbYu_IMEKbXsXX9N0_Ww-1 X-Mimecast-MFC-AGG-ID: _NgbYu_IMEKbXsXX9N0_Ww From: Thomas Huth To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Fabiano Rosas Subject: [PATCH 1/3] tests/qtest/test-x86-cpuid-compat: Remove tests related to pc-i440fx-2.3 Date: Fri, 17 Jan 2025 11:27:36 +0100 Message-ID: <20250117102738.59714-2-thuth@redhat.com> In-Reply-To: <20250117102738.59714-1-thuth@redhat.com> References: <20250117102738.59714-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZP5WEOURKTZ7SKHIEBK3S6LPYFNIMJBZ X-Message-ID-Hash: ZP5WEOURKTZ7SKHIEBK3S6LPYFNIMJBZ X-MailFrom: thuth@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , devel@lists.libvirt.org, Paolo Bonzini , Richard Henderson , Marcel Apfelbaum X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1737109708984019000 Content-Type: text/plain; charset="utf-8" The pc-i440fx-2.3 machine type has been removed in commit 46a2bd5257 ("hw/i386/pc: Remove deprecated pc-i440fx-2.3 machine") already, so these tests are just dead code by now. Signed-off-by: Thomas Huth Reviewed-by: Fabiano Rosas Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qtest/test-x86-cpuid-compat.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index b9e7e5ef7b..9cbc8b7ae9 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -357,19 +357,6 @@ int main(int argc, char **argv) "486", "xstore=3Don", "pc-i440fx-2.7", "xlevel2", 0); } - /* - * QEMU 2.3.0 had auto-level enabled for CPUID[7], already, - * and the compat code that sets default level shouldn't - * disable the auto-level=3D7 code: - */ - if (qtest_has_machine("pc-i440fx-2.3")) { - add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/off", - "Penryn", NULL, "pc-i440fx-2.3", - "level", 4); - add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.3/on", - "Penryn", "erms=3Don", "pc-i440fx-2.3", - "level", 7); - } if (qtest_has_machine("pc-i440fx-2.9")) { add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", "Conroe", NULL, "pc-i440fx-2.9", @@ -384,11 +371,6 @@ int main(int argc, char **argv) * code on old machine-types. Just check that the compat code * is working correctly: */ - if (qtest_has_machine("pc-i440fx-2.3")) { - add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.3", - "SandyBridge", NULL, "pc-i440fx-2.3", - "xlevel", 0x8000000a); - } if (qtest_has_machine("pc-i440fx-2.4")) { add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-off", "SandyBridge", NULL, "pc-i440fx-2.4", --=20 2.47.1 From nobody Tue Jan 21 03:57:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1737109727; cv=none; d=zohomail.com; s=zohoarc; b=YYSeJjciako27Yran5Ok/PusXNOXvLnbEm8KXUdHsCTgl4DyjLz8uk1szct3LaZDeZnYRzQ4wUG12pwufSwfSQ/VRkaMomuvIYLl4FPHRcosVeAsSn4g+Som59xsUt3k301Chm/FP9v1Mx9INLYioYCwJlFB69+/NTpP61Eki5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737109727; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kXREVQWRfWvPG+1pz3PjgO6y13c3igHha+JKYFKoeCg=; b=lIVdsyihr9VMz+E969C83W8AWeIX10T8IqBnaw5nsX4ILkwbIk6we3/s6lSezISYGw0UQ+VjTMk8PJiyXQhtOKS4UusxUfatinA5jXrh6Izz5hC2M49+IYbAH++a5ZqQXlS3oICjAbGE6/rUDgOJL7tIEoI9s4bFNjtm9kPPfkQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1737109727189685.3843891560989; Fri, 17 Jan 2025 02:28:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYja6-0001lF-OS; Fri, 17 Jan 2025 05:28:02 -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 1tYja4-0001l1-IV for qemu-devel@nongnu.org; Fri, 17 Jan 2025 05:28:00 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYja2-0004Dw-Pj for qemu-devel@nongnu.org; Fri, 17 Jan 2025 05:28:00 -0500 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-108-AgBjaq2tNZyOi8X1i12QiQ-1; Fri, 17 Jan 2025 05:27:55 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0FB5D1955DCC; Fri, 17 Jan 2025 10:27:54 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.246]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 28389195E3D9; Fri, 17 Jan 2025 10:27:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737109676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kXREVQWRfWvPG+1pz3PjgO6y13c3igHha+JKYFKoeCg=; b=Ynzz4YS6GsFQcoMfb9cKW+oD9z8LdKPGVUESdCyMBeXHXLk1oSCiWNOMBLfpODO+nnbcLk kYBICqK29qZtvy6uSXIrePfeN4407xhOAVM9NPrTYe5P4yDxLPOvPl5WH8s/aEVMTc9AkQ IoEfHmqw/KYu666PDUyBhdb+HO3zC1w= X-MC-Unique: AgBjaq2tNZyOi8X1i12QiQ-1 X-Mimecast-MFC-AGG-ID: AgBjaq2tNZyOi8X1i12QiQ From: Thomas Huth To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Fabiano Rosas Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , devel@lists.libvirt.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Paolo Bonzini , Richard Henderson , Marcel Apfelbaum Subject: [PATCH 2/3] hw/i386/pc_piix: Remove pc-i440fx-2.4 up to pc-i440fx-2.12 Date: Fri, 17 Jan 2025 11:27:37 +0100 Message-ID: <20250117102738.59714-3-thuth@redhat.com> In-Reply-To: <20250117102738.59714-1-thuth@redhat.com> References: <20250117102738.59714-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.093, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1.797, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1737109729045019000 Content-Type: text/plain; charset="utf-8" These machines have explicitly been marked as deprecated in QEMU 9.1, so it should be fine to remove these antique versioned machine types two releases later in 10.0. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- docs/about/deprecated.rst | 7 --- docs/about/removed-features.rst | 4 +- docs/interop/firmware.json | 2 +- hw/i386/pc_piix.c | 95 --------------------------------- qemu-options.hx | 10 ++-- 5 files changed, 8 insertions(+), 110 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 4a3c302962..7b42d6eecc 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -236,13 +236,6 @@ deprecated; use the new name ``dtb-randomness`` instea= d. The new name better reflects the way this property affects all random data within the device tree blob, not just the ``kaslr-seed`` node. =20 -``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 -instead. - PPC 405 ``ref405ep`` machine (since 9.1) '''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index c6616ce05e..936846ed7b 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1006,8 +1006,8 @@ mips ``fulong2e`` machine alias (removed in 6.0) =20 This machine has been renamed ``fuloong2e``. =20 -``pc-0.10`` up to ``pc-i440fx-2.3`` (removed in 4.0 up to 9.0) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +``pc-0.10`` up to ``pc-i440fx-2.12`` (removed in 4.0 up to 10.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 These machine types were very old and likely could not be used for live migration from old QEMU versions anymore. Use a newer machine type instead. diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 57f55f6c54..f1e74318ff 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -97,7 +97,7 @@ # machine types, not aliases. Glob patterns are understood, # which is especially useful for versioned machine types. # (For example, the glob pattern "pc-i440fx-*" matches -# "pc-i440fx-2.12".) On the QEMU command line, "-machine +# "pc-i440fx-9.1".) On the QEMU command line, "-machine # type=3D..." specifies the requested machine type (but that # option does not accept glob patterns). # diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 04d2957adc..b821c32b38 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -698,101 +698,6 @@ static void pc_i440fx_machine_3_0_options(MachineClas= s *m) =20 DEFINE_I440FX_MACHINE(3, 0); =20 -static void pc_i440fx_machine_2_12_options(MachineClass *m) -{ - pc_i440fx_machine_3_0_options(m); - compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len); - compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len); -} - -DEFINE_I440FX_MACHINE(2, 12); - -static void pc_i440fx_machine_2_11_options(MachineClass *m) -{ - pc_i440fx_machine_2_12_options(m); - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len); -} - -DEFINE_I440FX_MACHINE(2, 11); - -static void pc_i440fx_machine_2_10_options(MachineClass *m) -{ - pc_i440fx_machine_2_11_options(m); - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len); - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len); - m->auto_enable_numa_with_memhp =3D false; -} - -DEFINE_I440FX_MACHINE(2, 10); - -static void pc_i440fx_machine_2_9_options(MachineClass *m) -{ - pc_i440fx_machine_2_10_options(m); - compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len); - compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len); -} - -DEFINE_I440FX_MACHINE(2, 9); - -static void pc_i440fx_machine_2_8_options(MachineClass *m) -{ - pc_i440fx_machine_2_9_options(m); - compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len); - compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len); -} - -DEFINE_I440FX_MACHINE(2, 8); - -static void pc_i440fx_machine_2_7_options(MachineClass *m) -{ - pc_i440fx_machine_2_8_options(m); - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_I440FX_MACHINE(2, 7); - -static void pc_i440fx_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc =3D X86_MACHINE_CLASS(m); - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug =3D true; - x86mc->fwcfg_dma_enabled =3D false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_I440FX_MACHINE(2, 6); - -static void pc_i440fx_machine_2_5_options(MachineClass *m) -{ - X86MachineClass *x86mc =3D X86_MACHINE_CLASS(m); - - pc_i440fx_machine_2_6_options(m); - x86mc->save_tsc_khz =3D false; - m->legacy_fw_cfg_order =3D 1; - compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len); - compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len); -} - -DEFINE_I440FX_MACHINE(2, 5); - -static void pc_i440fx_machine_2_4_options(MachineClass *m) -{ - PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_5_options(m); - m->hw_version =3D "2.4.0"; - pcmc->broken_reserved_end =3D true; - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); -} - -DEFINE_I440FX_MACHINE(2, 4); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/qemu-options.hx b/qemu-options.hx index 7090d59f6f..a7cc4894f6 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -48,12 +48,12 @@ SRST =20 For architectures which aim to support live migration compatibility across releases, each release will introduce a new versioned machine - type. For example, the 2.8.0 release introduced machine types - "pc-i440fx-2.8" and "pc-q35-2.8" for the x86\_64/i686 architectures. + type. For example, the 9.1.0 release introduced machine types + "pc-i440fx-9.1" and "pc-q35-9.1" for the x86\_64/i686 architectures. =20 - To allow live migration of guests from QEMU version 2.8.0, to QEMU - version 2.9.0, the 2.9.0 version must support the "pc-i440fx-2.8" - and "pc-q35-2.8" machines too. To allow users live migrating VMs to + To allow live migration of guests from QEMU version 9.1.0 to QEMU + version 9.2.0, the 9.2.0 version must support the "pc-i440fx-9.1" + and "pc-q35-9.1" machines too. To allow users live migrating VMs to skip multiple intermediate releases when upgrading, new releases of QEMU will support machine types from many previous versions. =20 --=20 2.47.1 From nobody Tue Jan 21 03:57:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1737109729; cv=none; d=zohomail.com; s=zohoarc; b=IVuwF0ZqozhkX+iyg05XTP67ox52t3EO2dddpzQe2dvp+jPNllvKEwm1z88i9DMoTJdwOTCpobzj8rWdO/uJkrErO6Wz0jEG9+goIZwBzXnCcEZi8X4Wc1ZbO9GAR2t/+iWhVTyvPIrJdpMsGZVwdsLEPCNk2Shz0rVpH/yHu74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737109729; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yvrLcmeZVqKJRbAqvOvMCTKyKz4Kx/RoToFyOYy1EaI=; b=HpLSYnbxLc/Sx5h8DN4EmNJGWT5KTF+wpB9pppz2BOf2e7szGTuP6BTNMqxAYc0RBguua6qxWlQkZw8s+MfqzHAiI3UaKGPWRvaf/Pdwu3FYbgmZJzZwzjcPoxzgczwHPWUXeUdxSh3KWgiVsRRFSU/UI5cnsaUhHI3etGFtqv4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1737109729799625.5032464877172; Fri, 17 Jan 2025 02:28:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYjaK-0001mM-AG; Fri, 17 Jan 2025 05:28:16 -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 1tYjaE-0001lm-Kq for qemu-devel@nongnu.org; Fri, 17 Jan 2025 05:28:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYjaC-0004Fp-C1 for qemu-devel@nongnu.org; Fri, 17 Jan 2025 05:28:09 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-547-B4GebhnvPsS9pkqXXnMJNQ-1; Fri, 17 Jan 2025 05:28:01 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 67808195608D; Fri, 17 Jan 2025 10:28:00 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.246]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 62C90195608A; Fri, 17 Jan 2025 10:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737109686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yvrLcmeZVqKJRbAqvOvMCTKyKz4Kx/RoToFyOYy1EaI=; b=Xjmtec2gQ9wJJy4W4ha+rMD+HR62sZd0fY+//V4H+t3jMwsugdOtK2V1KMYNKAXwXAZOA/ tVBsqDyni1krUMSR1EtHQYCtfwaraCofIcsTF49PoBq8XSXmIRCl5Xp333LZxWhk7Z6wtk O/1z7P/s99HNVheE/kX5wfFvFbpVrMk= X-MC-Unique: B4GebhnvPsS9pkqXXnMJNQ-1 X-Mimecast-MFC-AGG-ID: B4GebhnvPsS9pkqXXnMJNQ From: Thomas Huth To: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Fabiano Rosas Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , devel@lists.libvirt.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Kashyap Chamarthy , Paolo Bonzini , Richard Henderson , Marcel Apfelbaum Subject: [PATCH 3/3] tests/qtest/test-x86-cpuid-compat: Replaced the removed pc-i440fx-2.* machines Date: Fri, 17 Jan 2025 11:27:38 +0100 Message-ID: <20250117102738.59714-4-thuth@redhat.com> In-Reply-To: <20250117102738.59714-1-thuth@redhat.com> References: <20250117102738.59714-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.093, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1737109730949019000 Content-Type: text/plain; charset="utf-8" Since the pc-i440fx-2.* machine types have been removed, let's run the tests with the corresponding q35 machine types instead (until those get removed, too, then we have to remove the tests completely). Signed-off-by: Thomas Huth --- tests/qtest/test-x86-cpuid-compat.c | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpu= id-compat.c index 9cbc8b7ae9..f77e481279 100644 --- a/tests/qtest/test-x86-cpuid-compat.c +++ b/tests/qtest/test-x86-cpuid-compat.c @@ -346,23 +346,23 @@ int main(int argc, char **argv) =20 /* Check compatibility of old machine-types that didn't * auto-increase level/xlevel/xlevel2: */ - if (qtest_has_machine("pc-i440fx-2.7")) { - add_cpuid_test("x86/cpuid/auto-level/pc-2.7", + if (qtest_has_machine("pc-q35-2.7")) { + add_cpuid_test("x86/cpuid/auto-level/pc-q35-2.7", "486", "arat=3Don,avx512vbmi=3Don,xsaveopt=3Don", - "pc-i440fx-2.7", "level", 1); - add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7", + "pc-q35-2.7", "level", 1); + add_cpuid_test("x86/cpuid/auto-xlevel/pc-q35-2.7", "486", "3dnow=3Don,sse4a=3Don,invtsc=3Don,npt=3Don,= svm=3Don", - "pc-i440fx-2.7", "xlevel", 0); - add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7", - "486", "xstore=3Don", "pc-i440fx-2.7", + "pc-q35-2.7", "xlevel", 0); + add_cpuid_test("x86/cpuid/auto-xlevel2/pc-q35-2.7", + "486", "xstore=3Don", "pc-q35-2.7", "xlevel2", 0); } - if (qtest_has_machine("pc-i440fx-2.9")) { - add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off", - "Conroe", NULL, "pc-i440fx-2.9", + if (qtest_has_machine("pc-q35-2.9")) { + add_cpuid_test("x86/cpuid/auto-level7/pc-q35-2.9/off", + "Conroe", NULL, "pc-q35-2.9", "level", 10); - add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on", - "Conroe", "erms=3Don", "pc-i440fx-2.9", + add_cpuid_test("x86/cpuid/auto-level7/pc-q35-2.9/on", + "Conroe", "erms=3Don", "pc-q35-2.9", "level", 10); } =20 @@ -371,12 +371,12 @@ int main(int argc, char **argv) * code on old machine-types. Just check that the compat code * is working correctly: */ - if (qtest_has_machine("pc-i440fx-2.4")) { - add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-off", - "SandyBridge", NULL, "pc-i440fx-2.4", + if (qtest_has_machine("pc-q35-2.4")) { + add_cpuid_test("x86/cpuid/xlevel-compat/pc-q35-2.4/npt-off", + "SandyBridge", NULL, "pc-q35-2.4", "xlevel", 0x80000008); - add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on", - "SandyBridge", "svm=3Don,npt=3Don", "pc-i440fx-2.4", + add_cpuid_test("x86/cpuid/xlevel-compat/pc-q35-2.4/npt-on", + "SandyBridge", "svm=3Don,npt=3Don", "pc-q35-2.4", "xlevel", 0x80000008); } =20 --=20 2.47.1