From nobody Tue Sep 9 03:32:21 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1746720999; cv=none; d=zohomail.com; s=zohoarc; b=KbAULlQcOZ97DED0oe2ZwrJxT0uuE+j2W06OkyFW+ZGtz+SqiZaj2CEfMocSSldbjJ0dOVt+Qr1+Q/sAmf2InrwHkxsHTZl7tu8c6TLdPT5uNPKoxSdWPjLfSYo7qTCcxY4p+wP7ElQ0DIRGCF/UTLrnQKTgFjYHvQRymOhk2a8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746720999; h=Content-Type: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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=dfkPAlB3ZW0sfG2ML+2QlCKaR7fek2gC0qmDv93OV6k=; b=NtXJAsbW4TBrWyLGEurHk0Az2rKlSpW08HgGV6pkmsyPbv2IloyIlaOTcg+frf7beUUavz+3lMJfTpAAcgXI1DWSEEKfxTu6YhjzDd4tlNEBbxVPT4QY85n2oOprYNj/YqieRaFCHehYz/yUb74fTc5To3uUkauIEjTz4HWyLyI= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1746720999723159.69965367285624; Thu, 8 May 2025 09:16:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2205F1710; Thu, 8 May 2025 12:16:39 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3A39515ED; Thu, 8 May 2025 12:16:13 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1D46D15BC; Thu, 8 May 2025 12:16:08 -0400 (EDT) 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 7400B16F8 for ; Thu, 8 May 2025 12:15:55 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-494-Ds6sSIvAPnu47t7Lc-zc-A-1; Thu, 08 May 2025 12:15:50 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 41828180045C; Thu, 8 May 2025 16:15:48 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.138]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 53477180049D; Thu, 8 May 2025 16:15:43 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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=1746720955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N3cKX666Bi8FN5j4sXz69W+1rVvNDKX62XzUMC75xX0=; b=MEj5gBd3bL8dO9XVDJKrpkzmDhKUJ1IXmXiQUNomXhAAW1IN96PgwInvcD5Zs3/+gPJMNO UvEZHL7orT0V1ET/br1ck+qYm8aSdCyAkeH1XtmwpuUpZTC8o3fwy2hkxH2nUHx3cWNA0w tltBM+dr/Cr2dKvRZet7qrpOu7wkZjw= X-MC-Unique: Ds6sSIvAPnu47t7Lc-zc-A-1 X-Mimecast-MFC-AGG-ID: Ds6sSIvAPnu47t7Lc-zc-A_1746720948 To: qemu-devel@nongnu.org Subject: [PULL 1/6] tests/qtest/q35-test: Remove the obsolete test_without_smram_base test Date: Thu, 8 May 2025 17:15:31 +0100 Message-ID: <20250508161536.865866-2-berrange@redhat.com> In-Reply-To: <20250508161536.865866-1-berrange@redhat.com> References: <20250508161536.865866-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SVFK7VX7NUIDHXSA4IS3765N427NDHNV X-Message-ID-Hash: SVFK7VX7NUIDHXSA4IS3765N427NDHNV X-MailFrom: berrange@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: Yanan Wang , devel@lists.libvirt.org, Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , Zhao Liu , Peter Maydell , Marcel Apfelbaum , Eduardo Habkost , John Snow , "Michael S. Tsirkin" , Thomas Huth 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: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746721000893019000 Content-Type: text/plain; charset="utf-8" From: Thomas Huth With the release of QEMU 10.1, the pc-q35-4.1 machine will be older than 6 years and thus will get disabled automatically by the MACHINE_VER_DELETION() macro. Remove the related test to avoid that the q35-test is failing when the machine is not available anymore. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- tests/qtest/q35-test.c | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/tests/qtest/q35-test.c b/tests/qtest/q35-test.c index 75d4078b79..62fff49fc8 100644 --- a/tests/qtest/q35-test.c +++ b/tests/qtest/q35-test.c @@ -246,41 +246,6 @@ static void test_smram_smbase_lock(void) qtest_quit(qts); } =20 -static void test_without_smram_base(void) -{ - QPCIBus *pcibus; - QPCIDevice *pcidev; - QTestState *qts; - int i; - - qts =3D qtest_init("-M pc-q35-4.1"); - - pcibus =3D qpci_new_pc(qts, NULL); - g_assert(pcibus !=3D NULL); - - pcidev =3D qpci_device_find(pcibus, 0); - g_assert(pcidev !=3D NULL); - - /* check that RAM is accessible */ - qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN); - g_assert_cmpint(qtest_readb(qts, SMBASE), =3D=3D, SMRAM_TEST_PATTERN); - - /* check that writing to 0x9c succeeds */ - for (i =3D 0; i <=3D 0xff; i++) { - qpci_config_writeb(pcidev, MCH_HOST_BRIDGE_F_SMBASE, i); - g_assert(qpci_config_readb(pcidev, MCH_HOST_BRIDGE_F_SMBASE) =3D= =3D i); - } - - /* check that RAM is still accessible */ - qtest_writeb(qts, SMBASE, SMRAM_TEST_PATTERN + 1); - g_assert_cmpint(qtest_readb(qts, SMBASE), =3D=3D, (SMRAM_TEST_PATTERN = + 1)); - - g_free(pcidev); - qpci_free_pc(pcibus); - - qtest_quit(qts); -} - int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); @@ -293,6 +258,6 @@ int main(int argc, char **argv) qtest_add_data_func("/q35/tseg-size/ext/16mb", &tseg_ext_16mb, test_tseg_size); qtest_add_func("/q35/smram/smbase_lock", test_smram_smbase_lock); - qtest_add_func("/q35/smram/legacy_smbase", test_without_smram_base); + return g_test_run(); } --=20 2.49.0 From nobody Tue Sep 9 03:32:21 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1746721033; cv=none; d=zohomail.com; s=zohoarc; b=U6yMIukbqRgCmynT+HaN1ARpRwMbQFSDZWKyJjBkA7VWEpOzzpjHo4M3X1D8FCj/bCR80MHnl9qLeyO1l7xYyQ+TPXIwQLWWLveEx/y90XagXfg/B35zrBkobu0SP5fLZ3gxCi+qCIvn9R2Oa4Z38z2mgQlbGtYKc739J8600+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746721033; h=Content-Type: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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=gFYWMW3FL8eGQvGU6RgK/vISIW1yFM67yXjqBEYIo+I=; b=HmEFM4xhHFH3ixSGrpfQLrRCk2PdanV44tZ7dTyzYqUsO/eDq131NRFF7Q6AhoJUDOON+W+GiLcp808uF5da53dcQMCGk4rmFFpTfKlMadjql0oyQUj2EqWDgn170ZX3DVbqBIaOzs0uHmvs6fKHLmYlAnJOHUu5WOYP8AoMpbE= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1746721033146919.8504113520787; Thu, 8 May 2025 09:17:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2DE8016FF; Thu, 8 May 2025 12:17:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 855A915D0; Thu, 8 May 2025 12:16:20 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1987E15F4; Thu, 8 May 2025 12:16:15 -0400 (EDT) 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 69F3C1658 for ; Thu, 8 May 2025 12:16:00 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-vWeumtVXNV6L6WBZwAziGQ-1; Thu, 08 May 2025 12:15:56 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 96B831800261; Thu, 8 May 2025 16:15:54 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.138]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D1609180049D; Thu, 8 May 2025 16:15:48 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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=1746720960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vk3jkct9NqEWi40WO0BjLvlM0IgMbodWmh1YSw0hSs0=; b=JpvpSHJOo51fj8+0M5UVmXCPZ3bxXVjGzWnxjVKYIKeyGCcs8ncmwLLY+Wvs962lfBsRhL 0UmfChpN7VoJdsa6pWOUhMp3hXBIf6wiYm4xuyhpS8ue1WJh0uvnrjLczr+QvD59LeZbxh 6LE3hjHu3GUIpdvSoFwFv02Z6il6Fyc= X-MC-Unique: vWeumtVXNV6L6WBZwAziGQ-1 X-Mimecast-MFC-AGG-ID: vWeumtVXNV6L6WBZwAziGQ_1746720955 To: qemu-devel@nongnu.org Subject: [PULL 2/6] Revert "include/hw: temporarily disable deletion of versioned machine types" Date: Thu, 8 May 2025 17:15:32 +0100 Message-ID: <20250508161536.865866-3-berrange@redhat.com> In-Reply-To: <20250508161536.865866-1-berrange@redhat.com> References: <20250508161536.865866-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: MCHCBATXAKSGNZPL5LZEH2GBWFFKDVGB X-Message-ID-Hash: MCHCBATXAKSGNZPL5LZEH2GBWFFKDVGB X-MailFrom: berrange@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: Yanan Wang , devel@lists.libvirt.org, Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , Zhao Liu , Peter Maydell , Marcel Apfelbaum , Eduardo Habkost , John Snow , "Michael S. Tsirkin" , Thomas Huth 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: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746721034447116600 Content-Type: text/plain; charset="utf-8" This reverts commit c9fd2d9a48ee3c195cf83cc611b87b09f02f0013. When we introduced the specialized machine type deprecation policy, we allow automatic deprecation to take effect immediately, but blocked the automatic deletion of machine types for 2 releases. This ensured we complied with the historical deprecation policy during the transition window. Startnig with the 10.1.0 dev cycle, the old machine types would be candidates for removal under both the old and new deprecation policies. Thus we can now enable automatic deletion of old machine types, which takes effect by skipping the QOM type registration. This prevents the machine types being listed with '-machine help', and blocks their creation. The actual code can be purged at a convenient time of the maintainer's choosing. In the case of the x86_64 target, this change results in the blocking of the following machine types: pc-i440fx-4.0 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-3.1 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-3.0 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.9 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.8 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.7 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.6 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.5 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.4 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.12 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.11 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-i440fx-2.10 Standard PC (i440FX + PIIX, 1996) (deprecated) pc-q35-4.0.1 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-4.0 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-3.1 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-3.0 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.9 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.8 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.7 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.6 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.5 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.4 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.12 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.11 Standard PC (Q35 + ICH9, 2009) (deprecated) pc-q35-2.10 Standard PC (Q35 + ICH9, 2009) (deprecated) Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- include/hw/boards.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 765dc8dd35..74a8e96b2e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -719,28 +719,11 @@ struct MachineState { * suitable period of time has passed, it will cause * execution of the method to return, avoiding registration * of the machine - * - * The new deprecation and deletion policy for versioned - * machine types was introduced in QEMU 9.1.0. - * - * Under the new policy a number of old machine types (any - * prior to 2.12) would be liable for immediate deletion - * which would be a violation of our historical deprecation - * and removal policy - * - * Thus deletions are temporarily gated on existance of - * the env variable "QEMU_DELETE_MACHINES" / QEMU version - * number >=3D 10.1.0. This gate can be deleted in the 10.1.0 - * dev cycle */ #define MACHINE_VER_DELETION(...) \ do { \ if (MACHINE_VER_SHOULD_DELETE(__VA_ARGS__)) { \ - if (getenv("QEMU_DELETE_MACHINES") || \ - QEMU_VERSION_MAJOR > 10 || (QEMU_VERSION_MAJOR =3D=3D 10 &= & \ - QEMU_VERSION_MINOR >=3D 1)) { \ - return; \ - } \ + return; \ } \ } while (0) =20 --=20 2.49.0 From nobody Tue Sep 9 03:32:21 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1746721118; cv=none; d=zohomail.com; s=zohoarc; b=ikSsxR6e4wnBt4u5iJlAe7vlxLsZVc4ukFetvnaCPNT5s3zZo1sUJLnUFb++W47VrJGMOsfFe0WUWLDA5EMrlSGCRUO5bcP47fpmcR+YZvvUS8Xc0xJ+M3D/AdtCeGf52J0eECX3UgvUhS9o2IpRJRCAvEUoQjmZoInNEz+kh1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746721118; h=Content-Type: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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=DWfqe2M9sefYwQZhp37yr2dGlQWFqfBclThEj1Vlhp8=; b=J93OsxMSO0fwxltsjgLsyQ6MscJCQJA4cJ4PtF5a9hb9lsHEtiatoUxlxORrAOmuJLyKDqdKI1kdQ3ww3xhPAQy0UieHIR1PlcM8k3dydDEAK3TFqvTYOju0S6aHhI+vnaafUXdxmlaKZlGcCwXQ3HBQhU9tocy/W8CtMxAK+zg= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1746721118141384.4351319529786; Thu, 8 May 2025 09:18:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 323AF1537; Thu, 8 May 2025 12:18:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0C1261554; Thu, 8 May 2025 12:17:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6A3AD16F7; Thu, 8 May 2025 12:17:18 -0400 (EDT) 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 802EE1743 for ; Thu, 8 May 2025 12:17:03 -0400 (EDT) Received: from mx-prod-mc-03.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-96-_O8JvQd3Ojm2xgM9_loRVQ-1; Thu, 08 May 2025 12:16:38 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E8B131955DDA; Thu, 8 May 2025 16:15:59 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.138]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4DB65180049D; Thu, 8 May 2025 16:15:54 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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=1746721022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zvYIrVIVSLJaAlAqe9SHyPChFnu6E1biirLk7L5CoFk=; b=iGuWp6CHW29tKzKTrrhLLDwzPU74zE/HWp12hsGX9/JiilBM5VTR26cOWLSwOIvXF/trt7 +hO+LDxTEQsPbqQChY5u1o8N4uptSbDdalohCEnB0eUHt/qvcWV4+o0UKnf1b6u4Aam7r5 F0Ti0iOswEI0fwW4Lvcf3uF/CAjz+PY= X-MC-Unique: _O8JvQd3Ojm2xgM9_loRVQ-1 X-Mimecast-MFC-AGG-ID: _O8JvQd3Ojm2xgM9_loRVQ_1746720961 To: qemu-devel@nongnu.org Subject: [PULL 3/6] include/hw/boards: cope with dev/rc versions in deprecation checks Date: Thu, 8 May 2025 17:15:33 +0100 Message-ID: <20250508161536.865866-4-berrange@redhat.com> In-Reply-To: <20250508161536.865866-1-berrange@redhat.com> References: <20250508161536.865866-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: DCLAEMO5SNVXKHOYWT7REWWZXB2643WY X-Message-ID-Hash: DCLAEMO5SNVXKHOYWT7REWWZXB2643WY X-MailFrom: berrange@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: Yanan Wang , devel@lists.libvirt.org, Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , Zhao Liu , Peter Maydell , Marcel Apfelbaum , Eduardo Habkost , John Snow , "Michael S. Tsirkin" , Thomas Huth 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: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746721118881116600 Content-Type: text/plain; charset="utf-8" When VERSION is set to a development snapshot (micro >=3D 50), or a release candidate (micro >=3D 90) we have an off-by-1 in determining deprecation and deletion thresholds for versioned machine types. In such cases we need to use the next major/minor version in threshold checks. This adapts the deprecation macros to do "next version" prediction when seeing a dev/rc version number. This ensures users of release candidates get an accurate view of machines that will be deprecated/deleted in the final release. This requires hardcoding our current release policy of 3 releases per year, with a major bump at the start of each year, and that dev/rc versions have micro >=3D 50. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- include/hw/boards.h | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index 74a8e96b2e..a6784fe984 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -650,11 +650,42 @@ struct MachineState { " years old are subject to deletion after " \ stringify(MACHINE_VER_DELETION_MAJOR) " years" =20 -#define _MACHINE_VER_IS_EXPIRED_IMPL(cutoff, major, minor) \ +#define _MACHINE_VER_IS_CURRENT_EXPIRED(cutoff, major, minor) \ (((QEMU_VERSION_MAJOR - major) > cutoff) || \ (((QEMU_VERSION_MAJOR - major) =3D=3D cutoff) && \ (QEMU_VERSION_MINOR - minor) >=3D 0)) =20 +#define _MACHINE_VER_IS_NEXT_MINOR_EXPIRED(cutoff, major, minor) \ + (((QEMU_VERSION_MAJOR - major) > cutoff) || \ + (((QEMU_VERSION_MAJOR - major) =3D=3D cutoff) && \ + ((QEMU_VERSION_MINOR + 1) - minor) >=3D 0)) + +#define _MACHINE_VER_IS_NEXT_MAJOR_EXPIRED(cutoff, major, minor) \ + ((((QEMU_VERSION_MAJOR + 1) - major) > cutoff) || \ + ((((QEMU_VERSION_MAJOR + 1) - major) =3D=3D cutoff) && \ + (0 - minor) >=3D 0)) + +/* + * - The first check applies to formal releases + * - The second check applies to dev snapshots / release candidates + * where the next major version is the same. + * e.g. 9.0.50, 9.1.50, 9.0.90, 9.1.90 + * - The third check applies to dev snapshots / release candidates + * where the next major version will change. + * e.g. 9.2.50, 9.2.90 + * + * NB: this assumes we do 3 minor releases per year, before bumping major, + * and dev snapshots / release candidates are numbered with micro >=3D 50 + * If this ever changes the logic below will need modifying.... + */ +#define _MACHINE_VER_IS_EXPIRED_IMPL(cutoff, major, minor) \ + ((QEMU_VERSION_MICRO < 50 && \ + _MACHINE_VER_IS_CURRENT_EXPIRED(cutoff, major, minor)) || \ + (QEMU_VERSION_MICRO >=3D 50 && QEMU_VERSION_MINOR < 2 && \ + _MACHINE_VER_IS_NEXT_MINOR_EXPIRED(cutoff, major, minor)) || \ + (QEMU_VERSION_MICRO >=3D 50 && QEMU_VERSION_MINOR =3D=3D 2 && \ + _MACHINE_VER_IS_NEXT_MAJOR_EXPIRED(cutoff, major, minor))) + #define _MACHINE_VER_IS_EXPIRED2(cutoff, major, minor) \ _MACHINE_VER_IS_EXPIRED_IMPL(cutoff, major, minor) #define _MACHINE_VER_IS_EXPIRED3(cutoff, major, minor, micro) \ --=20 2.49.0 From nobody Tue Sep 9 03:32:21 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1746721056; cv=none; d=zohomail.com; s=zohoarc; b=euSgxAPE34Ja5bhC4cHARippHtis+n2pLdmHW8hTk49ia1sFG8uC+3kvSYJS54ZpJD590Gr3tJMrbDe1e6GXvYzw6MebHAC0hPu1QHTJ8G5TMIH0xWNithcNPEJnQq25yAJVKvLpi9qz/4wu2u7DcElzS9myQxRTQR4KcWLKhKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746721056; h=Content-Type: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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=z2iweabdyVoit/jjBT72ggeIjyUDWsesjW5sUNndI1Q=; b=iUHZt0ZCBjDfglr3VlH207cVp/MQZ5x8VGm1V35W19sNSVx5iAzyOjcrm1VHUSBaOQpVIyx2Nv/+L5durOc87RysHpYuc2D4qw9Jolv+SOgK6vEmHfnUa1ko2ryHXvMRi+fAIRGcQcXHrBK8UzocLhJq+k8SenMUWsvGMB8Rs3w= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1746721056711300.1933044216544; Thu, 8 May 2025 09:17:36 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 182D5173A; Thu, 8 May 2025 12:17:36 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6F864143E; Thu, 8 May 2025 12:16:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6657E11D8; Thu, 8 May 2025 12:16:17 -0400 (EDT) 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 E7433150B for ; Thu, 8 May 2025 12:16:10 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-292-9FWHqIQEPiOEFnC_QbUHow-1; Thu, 08 May 2025 12:16:07 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 732CA1800873; Thu, 8 May 2025 16:16:05 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.138]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8191F180049D; Thu, 8 May 2025 16:16:00 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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=1746720970; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HwOcpi+9T+JesxeWKYiSCfHmrCWWHyDSCeVzASoCOqo=; b=A6aeL5uwBQ/SiCeaFtZDO6Q6sYl20MCzAaOajoxLH+WlQIbGGVM76LjBF5/jVrGXkI6gEK RaU2rxU+cXHuZhvaniF8e3jrXqRx/9D9y5gyFv1IMI5PsqrU4dNv6rpOEKPMBLNWWLG9up vCYQBp4IEMrY9azeENQzJ9x0c8yVylY= X-MC-Unique: 9FWHqIQEPiOEFnC_QbUHow-1 X-Mimecast-MFC-AGG-ID: 9FWHqIQEPiOEFnC_QbUHow_1746720965 To: qemu-devel@nongnu.org Subject: [PULL 4/6] docs/about/deprecated: auto-generate a note for versioned machine types Date: Thu, 8 May 2025 17:15:34 +0100 Message-ID: <20250508161536.865866-5-berrange@redhat.com> In-Reply-To: <20250508161536.865866-1-berrange@redhat.com> References: <20250508161536.865866-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5M7CIWQBK7AAWDLCT2U23AEAP4JCPZSW X-Message-ID-Hash: 5M7CIWQBK7AAWDLCT2U23AEAP4JCPZSW X-MailFrom: berrange@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: Yanan Wang , devel@lists.libvirt.org, Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , Zhao Liu , Peter Maydell , Marcel Apfelbaum , Eduardo Habkost , John Snow , "Michael S. Tsirkin" , Thomas Huth 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: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746721059036019000 Content-Type: text/plain; charset="utf-8" We deprecate versioned machine types on a fixed schedule. This allows us to auto-generate a paragraph in the deprecated.rst document that always has accurate version info. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/about/deprecated.rst | 7 +++++++ docs/conf.py | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 05381441a9..1a1b423030 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -278,6 +278,13 @@ CPU implementation for a while before removing all sup= port. System emulator machines ------------------------ =20 +Versioned machine types (aarch64, arm, i386, m68k, ppc64, s390x, x86_64) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +In accordance with our versioned machine type deprecation policy, all mach= ine +types with version |VER_MACHINE_DEPRECATION_VERSION|, or older, have been +deprecated. + Arm ``virt`` machine ``dtb-kaslr-seed`` property (since 7.1) '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/conf.py b/docs/conf.py index 7b5712e122..60dcf2a541 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -117,6 +117,27 @@ else: version =3D release =3D "unknown version" =20 +bits =3D version.split(".") + +major =3D int(bits[0]) +minor =3D int(bits[1]) +micro =3D int(bits[2]) + +# Check for a dev snapshot, so we can adjust to next +# predicted release version. +# +# This assumes we do 3 releases per year, so must bump +# major if minor =3D=3D 2 +if micro >=3D 50: + micro =3D 0 + if minor =3D=3D 2: + major +=3D 1 + minor =3D 0 + else: + minor +=3D 1 + +ver_machine_deprecation_version =3D "%d.%d.0" % (major - 3, minor) + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. # @@ -145,7 +166,17 @@ # environment variable is not set is for the benefit of readthedocs # style document building; our Makefile always sets the variable. confdir =3D os.getenv('CONFDIR', "/etc/qemu") -rst_epilog =3D ".. |CONFDIR| replace:: ``" + confdir + "``\n" + +vars =3D { + "CONFDIR": confdir, + "VER_MACHINE_DEPRECATION_VERSION": ver_machine_deprecation_version, +} + +rst_epilog =3D "".join([ + ".. |" + key + "| replace:: ``" + vars[key] + "``\n" + for key in vars.keys() +]) + # We slurp in the defs.rst.inc and literally include it into rst_epilog, # because Sphinx's include:: directive doesn't work with absolute paths # and there isn't any one single relative path that will work for all --=20 2.49.0 From nobody Tue Sep 9 03:32:21 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1746721079; cv=none; d=zohomail.com; s=zohoarc; b=il22poqypp49/8ScFi8dqQpkVOHRtBemAFQovu+r0d8YHCkiRH6S6SgIDKkVGsVADX2u7ddMr+Rf1jc6wNXP3XGizNWE+fhFuBkvsltRsDV7u1SLskMxPmmEYXtKoZUfouE48IpHhgPeGcK3OD0DN/3wq80tBL9Svln8FfBz1z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746721079; h=Content-Type: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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=6Hxwl9A9ju8yXPLkCamY+E+JwArKA3X77mnkiby8CGg=; b=cipZy9YZFsirHAqHUrz8yQ7dkwuI0zgPlyFWQO+RM/vb1i1ybnNtsi2cu2N27Vc1F0X+WT6pclHp6h40NlG43O48Je8qI83I1DResky/WkjiwWfidLUtnL6aY6DdSEJkHzfUNZSNftFQgju6FhNUe4K7gpD3WyBOs65WP74shs8= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1746721079654245.6922991731775; Thu, 8 May 2025 09:17:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id AE6E115CD; Thu, 8 May 2025 12:17:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4BB3B11D8; Thu, 8 May 2025 12:16:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BC9D8171B; Thu, 8 May 2025 12:16:33 -0400 (EDT) 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 2CC501726 for ; Thu, 8 May 2025 12:16:19 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618--k1_qA7ZPjyykkWva8K6Cg-1; Thu, 08 May 2025 12:16:12 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 025ED1801A18; Thu, 8 May 2025 16:16:11 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.138]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E8D6180049D; Thu, 8 May 2025 16:16:05 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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=1746720978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UpQjF3fu57+/BPd5uhocDEKBwd3L0AMAbd+JuHdLGpQ=; b=dxMvsZc2sG5E4eNCDIBIn/S/ivBs3fZoAv5s5jRZ5SsZhOzm+Av6vrNAkeAqyMkV2zdS9M n0/3ZkLfjgiJgt3/mQPMLXnoOLSQ7xnp/GIYId7AiMMnsQW+SwSvN9Q21Io2G4sKBk+3i7 NpIpY+2T4HNoDeOcztUnyGfohUYbq3w= X-MC-Unique: -k1_qA7ZPjyykkWva8K6Cg-1 X-Mimecast-MFC-AGG-ID: -k1_qA7ZPjyykkWva8K6Cg_1746720971 To: qemu-devel@nongnu.org Subject: [PULL 5/6] docs/about/removed-features: auto-generate a note for versioned machine types Date: Thu, 8 May 2025 17:15:35 +0100 Message-ID: <20250508161536.865866-6-berrange@redhat.com> In-Reply-To: <20250508161536.865866-1-berrange@redhat.com> References: <20250508161536.865866-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6VGSGBVRWQCS74U2252BINABS57CDT7J X-Message-ID-Hash: 6VGSGBVRWQCS74U2252BINABS57CDT7J X-MailFrom: berrange@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: Yanan Wang , devel@lists.libvirt.org, Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , Zhao Liu , Peter Maydell , Marcel Apfelbaum , Eduardo Habkost , John Snow , "Michael S. Tsirkin" , Thomas Huth 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: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746721080685116600 Content-Type: text/plain; charset="utf-8" We remove versioned machine types on a fixed schedule. This allows us to auto-generate a paragraph in the removed-features.rst document that always has accurate version info. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/about/removed-features.rst | 10 ++++++---- docs/conf.py | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 790a5e481c..063284d4f8 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -981,10 +981,12 @@ from Linux in 2021, and is not supported anymore by Q= EMU either. System emulator machines ------------------------ =20 -Note: Versioned machine types that have been introduced in a QEMU version -that has initially been released more than 6 years before are considered -obsolete and will be removed without further notice in this document. -Please use newer machine types instead. +Versioned machine types (aarch64, arm, i386, m68k, ppc64, s390x, x86_64) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +In accordance with our versioned machine type deprecation policy, all mach= ine +types with version |VER_MACHINE_DELETION_VERSION|, or older, have been +removed. =20 ``s390-virtio`` (removed in 2.6) '''''''''''''''''''''''''''''''' diff --git a/docs/conf.py b/docs/conf.py index 60dcf2a541..248ff8cf5d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -137,6 +137,7 @@ minor +=3D 1 =20 ver_machine_deprecation_version =3D "%d.%d.0" % (major - 3, minor) +ver_machine_deletion_version =3D "%d.%d.0" % (major - 6, minor) =20 # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -170,6 +171,7 @@ vars =3D { "CONFDIR": confdir, "VER_MACHINE_DEPRECATION_VERSION": ver_machine_deprecation_version, + "VER_MACHINE_DELETION_VERSION": ver_machine_deletion_version, } =20 rst_epilog =3D "".join([ --=20 2.49.0 From nobody Tue Sep 9 03:32:21 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1746721097; cv=none; d=zohomail.com; s=zohoarc; b=Tgus3FPOCDwdCft93j4iNXcI3BFR9ozH4NsYKs8r9WYck6yv5+iLHjNdLx3ZBeaoO+9tVOg2dWj0pmdPU+htcZ8bvPmPH1Z/+GOUigv/i9Nf09N5cNVKvrjYXUYSIL8xLX/Ewn5nT5tm/uTLlSlQhO5Ua7U9Bua0Q1AO5f3uH80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746721097; h=Content-Type: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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=Ym12+tlpEIeD0un6pgwCKsdUZjvFx3RrjeXjdUWJ1nE=; b=EoiBD1LlXmWxJzaI4i9PrTtpVXKb9slIohY/z9G4UWM2ooD+cGyFDzEdLLagqlpveFi9pHFUgpAgGvQLCpF4WwNZUQtxlPzroPnyj8UbR9jcdalE9FnNkcHRtswr00URmpzYbpZQF8b4uQb5mVFs7g3iTqVgvy5VAGqTHG9RVv0= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1746721097829748.8388330330004; Thu, 8 May 2025 09:18:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 35945160E; Thu, 8 May 2025 12:18:17 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 05EA11712; Thu, 8 May 2025 12:16:41 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3B9981503; Thu, 8 May 2025 12:16:34 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 F2403172F for ; Thu, 8 May 2025 12:16:21 -0400 (EDT) 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-127-WWzN9ky8MCGwuWN-R9latA-1; Thu, 08 May 2025 12:16:18 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 CE2291956089; Thu, 8 May 2025 16:16:16 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.138]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 903E8180049D; Thu, 8 May 2025 16:16:11 +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=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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=1746720981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SL4P6zjxi3eHKmbO6XFzi9rgIjlHs8jYLeIdHJXZ30w=; b=g6OYDHViy6SG1xeogs2XNqkXhhf3qf3eL9FJqrZnK5gOck2W7LTACvnIm3E+8y5N/wfmia 85BghHiO2xQN4DonaRS+lRQVRjPKHb8CBVkh3oe3TYDJh8nN4IaSCYa3z7ZMuorVWHnLO8 b6Yi9BAdaT+FImP0M1MQM2f4o0dCGQ0= X-MC-Unique: WWzN9ky8MCGwuWN-R9latA-1 X-Mimecast-MFC-AGG-ID: WWzN9ky8MCGwuWN-R9latA_1746720977 To: qemu-devel@nongnu.org Subject: [PULL 6/6] include/hw/boards: add warning about changing deprecation logic Date: Thu, 8 May 2025 17:15:36 +0100 Message-ID: <20250508161536.865866-7-berrange@redhat.com> In-Reply-To: <20250508161536.865866-1-berrange@redhat.com> References: <20250508161536.865866-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: K4FTPVJPRONTKW4H64ZW2L77DS2KZTR5 X-Message-ID-Hash: K4FTPVJPRONTKW4H64ZW2L77DS2KZTR5 X-MailFrom: berrange@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: Yanan Wang , devel@lists.libvirt.org, Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , Zhao Liu , Peter Maydell , Marcel Apfelbaum , Eduardo Habkost , John Snow , "Michael S. Tsirkin" , Thomas Huth 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: From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9_via_Devel?= Reply-To: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746721099123019000 Content-Type: text/plain; charset="utf-8" If we change the deprecation logic in include/hw/boards.h, we must make a corresponding change to docs/conf.py and docs/about/deprecated.rst. Add comments to these files as a warning to future maintainers to keep these files in sync. Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/conf.py | 4 ++++ include/hw/boards.h | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 248ff8cf5d..f892a6e1da 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -136,6 +136,10 @@ else: minor +=3D 1 =20 +# These thresholds must match the constants +# MACHINE_VER_DELETION_MAJOR & MACHINE_VER_DEPRECATION_MAJOR +# defined in include/hw/boards.h and the introductory text in +# docs/about/deprecated.rst ver_machine_deprecation_version =3D "%d.%d.0" % (major - 3, minor) ver_machine_deletion_version =3D "%d.%d.0" % (major - 6, minor) =20 diff --git a/include/hw/boards.h b/include/hw/boards.h index a6784fe984..a7b1fcffae 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -636,7 +636,11 @@ struct MachineState { /* * How many years/major releases for each phase * of the life cycle. Assumes use of versioning - * scheme where major is bumped each year + * scheme where major is bumped each year. + * + * These values must match the ver_machine_deprecation_version + * and ver_machine_deletion_version logic in docs/conf.py and + * the text in docs/about/deprecated.rst */ #define MACHINE_VER_DELETION_MAJOR 6 #define MACHINE_VER_DEPRECATION_MAJOR 3 --=20 2.49.0