From nobody Tue Sep 9 03:10:45 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=1746547289; cv=none; d=zohomail.com; s=zohoarc; b=eqQUJnRcuStDuwSBN7wLw7HI6btMMZe/mD/qDqaGI3uGqS5q/ZEPjB/nfz7jBCAzSHZYdtTP4UFSBjvXJtvK6JWeA2JuncBXXhTpnOQew9dC1O0wOKDSWzgmYEt3XEkSqMCzCoLvg5FAu3qP+5VntrLqdsy0oBe6oX2M0IHzeVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746547289; 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=dg7MiWuP7yjMdqJfJLSxmOjBwPOSWu9Ff8nrpuuOwag=; b=GtbBakC8rxWwtoNTw413RR+ax8MS0avC97g1Tirlr6oMXNsrP8BauJbqNIY181zyFkvvuWEu+ejfAO8y0zd8YA0XcnYpNa7saG0hFjAffJF1/klNcSp1ORn3oyIfW2wdHITfVJUsGjdHWrVpa0rng5VBv+G9lFufQfK+U5lexMQ= 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 174654728949935.952126360878424; Tue, 6 May 2025 09:01:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D86B41364; Tue, 6 May 2025 12:01:28 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 30DD91401; Tue, 6 May 2025 12:00:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5D9E814F6; Tue, 6 May 2025 12:00:49 -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 CDACE14FA for ; Tue, 6 May 2025 12:00:40 -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-335-Z_5klJdiMNGWuhL1H4NbKA-1; Tue, 06 May 2025 12:00:37 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 888F518011DD; Tue, 6 May 2025 16:00:34 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.127]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E130F19560AB; Tue, 6 May 2025 16:00:30 +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=1746547240; 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=kYS7R6zEdHl6MbeKrXmrsQiG55u3uarQSO6zcHZcyEU=; b=BHGkyhdvRFUHSvYuBmJP8pzTB31TZ5L1ANkhfyeoOPdiL2HX4EW0rNDHab+coFARoM/SKg /H9cS0ke33LFOSg02VEkcMic6eRESn9Xmg/NepzOqrwo/PfUtYDlcEYlmNTRXlUXEKJcPJ EOnfFt7AWDDVxVCNkMZMe0PdKWsg3QI= X-MC-Unique: Z_5klJdiMNGWuhL1H4NbKA-1 X-Mimecast-MFC-AGG-ID: Z_5klJdiMNGWuhL1H4NbKA_1746547234 To: qemu-devel@nongnu.org Subject: [PATCH v3 1/5] Revert "include/hw: temporarily disable deletion of versioned machine types" Date: Tue, 6 May 2025 17:00:20 +0100 Message-ID: <20250506160024.2380244-2-berrange@redhat.com> In-Reply-To: <20250506160024.2380244-1-berrange@redhat.com> References: <20250506160024.2380244-1-berrange@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: XEW77DRBXXVZTQQJTYCEZMR2UWKR5K6G X-Message-ID-Hash: XEW77DRBXXVZTQQJTYCEZMR2UWKR5K6G 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 , "Michael S. Tsirkin" , devel@lists.libvirt.org, Marcel Apfelbaum , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Peter Maydell , John Snow 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: 1746547291896019000 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) Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michael S. Tsirkin Reviewed-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=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:10:45 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=1746547313; cv=none; d=zohomail.com; s=zohoarc; b=VxTnhPblIHt5tijYc9M08lBlG0E4wjvY8u1mXF1xns0Qy6xZh2WpXo+sNu+KP7gCpuPjwxHad9tFOt8PhdxMZmsvAtV89sCY3eG0mvSOgCCqOscqy2fg2AvRbQ+JK+wKu2YozJ1l8ybXR9pMX3cLyHcyguvP3DdvAwb9npLkMwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746547313; 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=ptRxJOC69yJPL+mryRaPdD5PaK7Yiu2qVLuTpe4H+vU=; b=PUpXE/4IW9VDjTQXQm10ShO6IjNF1uBa0DWvsa5zU/ILnLLEoyGKVKAkzc/WrVeFINgLlrWSdOBq91XfdyD9cRSKeru2XPZ/o2+uYdpOXN0jr9U5ypmA21bBzkVnhjj6x9Z631OkCk3Za5BmbkDyfABLZIwrouLMGbp/mANbhlI= 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 1746547313887192.32822577836475; Tue, 6 May 2025 09:01:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5884E1504; Tue, 6 May 2025 12:01:53 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1AECA135A; Tue, 6 May 2025 12:00:59 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E3C29156C; Tue, 6 May 2025 12:00:54 -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 82A041424 for ; Tue, 6 May 2025 12:00:45 -0400 (EDT) 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-683-aHBNvdxMNvizjwLGPDdbxg-1; Tue, 06 May 2025 12:00:44 -0400 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 4A6291955E94; Tue, 6 May 2025 16:00:41 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.127]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 364B81956094; Tue, 6 May 2025 16:00:34 +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=1746547245; 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=+NpR0xYOkKIQmVHmAyuyMZPnLq40++Dt46hOxtxCL3s=; b=dB2dDyo7V2JRtIHZjBXWkjlLEwTHQNrjEsNmSxJHK9g/RCslcqHUVcMHkSVJ6v1JqgeUl3 XTn0BlU3V0mwU3ABXR2oCrvVEWYoBXjbGRvIDscKW+X53pXfWgYCAnYQN/n9395uclaO0S YnNQCEEymQOFGLx2FnB+96RYlUPetyU= X-MC-Unique: aHBNvdxMNvizjwLGPDdbxg-1 X-Mimecast-MFC-AGG-ID: aHBNvdxMNvizjwLGPDdbxg_1746547241 To: qemu-devel@nongnu.org Subject: [PATCH v3 2/5] include/hw/boards: cope with dev/rc versions in deprecation checks Date: Tue, 6 May 2025 17:00:21 +0100 Message-ID: <20250506160024.2380244-3-berrange@redhat.com> In-Reply-To: <20250506160024.2380244-1-berrange@redhat.com> References: <20250506160024.2380244-1-berrange@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: HYLF77NWS7TNET6QGQH6PMIV5QZO5W2T X-Message-ID-Hash: HYLF77NWS7TNET6QGQH6PMIV5QZO5W2T 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 , "Michael S. Tsirkin" , devel@lists.libvirt.org, Marcel Apfelbaum , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Peter Maydell , John Snow 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: 1746547316118019000 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. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michael S. Tsirkin Reviewed-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=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:10:45 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=1746547338; cv=none; d=zohomail.com; s=zohoarc; b=mDtWY7TIElg5YENwZdvtlbeJSrWBzcodja7s9cX/eEnJDjU7/wu085jE7NeLrWaMi1Ft74q+GcF5OY5HJtIACDX3oJJON6gqRx/pgUTvJv62lD6zInpLSMZbSxhRhvsBieRhDiP/5NA5kJG6tEml1qqggnGlM/XQpblDi6/ZJJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746547338; 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=ZGbfagtCV7jF65QUwGAv7WmTvjLQUvRTCm6FNXQ3xuM=; b=Uig3PkrTDFTqlwSrWz1qrUWZcGW1cvRytHUD36Pq/fPL8/rZiTThZxyC9bd8LJFHYfdJ/A6iNoUJN9WQQ8F68rvtqjSakgNYGdi50TsDcFIoYiiqFHfENpNATEN1b4uj6Y9ZXp3rIVgAz6zQjPTeY6pxI0/yHqdioMDZEnu7rAA= 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 1746547338540765.035566987988; Tue, 6 May 2025 09:02:18 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B2DAC9B9; Tue, 6 May 2025 12:02:17 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C0B2D144F; Tue, 6 May 2025 12:01:02 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3BC651485; Tue, 6 May 2025 12:00:59 -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 5145914C8 for ; Tue, 6 May 2025 12:00:50 -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-625-CA29Nj_MMbKR2yj2jDb-8w-1; Tue, 06 May 2025 12:00:46 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4E7541801A1E; Tue, 6 May 2025 16:00:45 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.127]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D92AC1956094; Tue, 6 May 2025 16:00:41 +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=1746547249; 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=kPLy8NKP7Tp6cI9RA6AHOioL2/HsHXmBgssyWkntyFA=; b=N9PEIzTNTKXD8xdJYI3rkIG5IfxECNBgbqWrG7MaxSsVslJt1zzG4Mmu0P76u5EUBJYNPx oueiBv53yj9hGi3h0vCYRULsK2tMC3chhVZYONP8WVqj/FgMAjyejbkdo5mNEog/fKoxZk Adei341sadYeQhl71aaDP9Mp4VJjPds= X-MC-Unique: CA29Nj_MMbKR2yj2jDb-8w-1 X-Mimecast-MFC-AGG-ID: CA29Nj_MMbKR2yj2jDb-8w_1746547245 To: qemu-devel@nongnu.org Subject: [PATCH v3 3/5] docs/about/deprecated: auto-generate a note for versioned machine types Date: Tue, 6 May 2025 17:00:22 +0100 Message-ID: <20250506160024.2380244-4-berrange@redhat.com> In-Reply-To: <20250506160024.2380244-1-berrange@redhat.com> References: <20250506160024.2380244-1-berrange@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: 7WTHOVOCVLDMHFUETGJ2TGOO4WSFY3RO X-Message-ID-Hash: 7WTHOVOCVLDMHFUETGJ2TGOO4WSFY3RO 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 , "Michael S. Tsirkin" , devel@lists.libvirt.org, Marcel Apfelbaum , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Peter Maydell , John Snow 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: 1746547340113019000 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. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michael S. Tsirkin Reviewed-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=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:10:45 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=1746547358; cv=none; d=zohomail.com; s=zohoarc; b=k2x9ztICWMLa17YipcGbeJ9dx/lVyFyQ0PxMSU2xemRHjTwy3GL7FmdC6dLGtjO/vnXRldVNnCEwo8Tl2LFaCX/udjw593w4tRwNExw/Q32GZx6e+4HUSnwKoughjMkUWg+T12a6LEKNo9+i57fby+d6MlBYDf7fJv7dTlCBWus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746547358; 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=808arbtMLKEvKANuOA8AudWFAsEIyY7+a7IRkX2sMwk=; b=ByuIyNFCbx76SsXJBsIFxf8A7PgJFeRCGVQT/iBl1IXDRrKAU7lp4y9xa3tbeJ+g/vP0gpF1ZvCq3y8bFFMYZl0w/vOj4EqU6VLhyQUo3Ba9+P2S1QcsvD40OpVY6xgBZuVSyySQJrZSkjBurkliGNlhOt6xL8lgpR6hK4BGuZY= 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 174654735813682.44965753401448; Tue, 6 May 2025 09:02:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8D59AE32; Tue, 6 May 2025 12:02:37 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7CF6A14C8; Tue, 6 May 2025 12:01:17 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 68A5414B5; Tue, 6 May 2025 12:01:12 -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 AA253134A for ; Tue, 6 May 2025 12:00:56 -0400 (EDT) Received: from mx-prod-mc-01.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-278-9TTVOCyqObq3z0AivgAMpw-1; Tue, 06 May 2025 12:00:51 -0400 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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7E6111955D5C; Tue, 6 May 2025 16:00:49 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.127]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C17031956094; Tue, 6 May 2025 16:00:45 +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=1746547256; 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=EuH78BOhFXmVuEohyU2Pwkfvx5FQd4xoWpc6SExlnc4=; b=N4dic9hfeAXHx7mMJ6xP3OeT8sDKNtUsFsi/knDH3wSvC9qjgNfgG3hEQHLbSISIdBXsoo mLLxmPRFpScVhwVPz0n7++VRPQRdCnuXMdz4MGTw18ly7W+kxnNSpgf2nERbW1pk3QSKGc ent6RlKMqVHCtyKRm8lc1imRQEjme0U= X-MC-Unique: 9TTVOCyqObq3z0AivgAMpw-1 X-Mimecast-MFC-AGG-ID: 9TTVOCyqObq3z0AivgAMpw_1746547249 To: qemu-devel@nongnu.org Subject: [PATCH v3 4/5] docs/about/removed-features: auto-generate a note for versioned machine types Date: Tue, 6 May 2025 17:00:23 +0100 Message-ID: <20250506160024.2380244-5-berrange@redhat.com> In-Reply-To: <20250506160024.2380244-1-berrange@redhat.com> References: <20250506160024.2380244-1-berrange@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: PJOOC5O3RW7G4JWPRRCQYEYFJYUTF47U X-Message-ID-Hash: PJOOC5O3RW7G4JWPRRCQYEYFJYUTF47U 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 , "Michael S. Tsirkin" , devel@lists.libvirt.org, Marcel Apfelbaum , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Peter Maydell , John Snow 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: 1746547360169019000 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. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michael S. Tsirkin Reviewed-by: Thomas Huth Tested-by: Philippe Mathieu-Daud=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:10:45 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=1746547376; cv=none; d=zohomail.com; s=zohoarc; b=cWx42XrwZ7I6n/LjobmPwnBoRzuT3PozKYmUiVoV0W3J/Fr1+uuSTInz8G7yMe0sxBwtTHnr+LVMQ6VxVa4zKg1EhsrdqJfTbhxITcK8XORZWenBOfsA8ZyaTaqHoBF+f3SsovT0LEzjNXQa1c2ooLrmnSxmmibgJdrv63n78dM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746547376; 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=6LytaoRKWDfMHybT2MMJyC+k1fpwq+zTR3mDsuNGPzo=; b=RJLm9uq/I7cIDUDH85OSUVxiZGyJ+36EEc7O4Kjzz9oFGuuvrUnyEu6ZfoYJxGCpobZqDWHQMBTXIba+1P2WGgAYA6hvcCHXVOFYCxTU9OlcQYOC2m3MMhJY6VtvPQ7D9ejOXhO7tsNTl4c05IbdKMWpjBaAuFoBGWiL+w/9p3g= 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 1746547376044689.6867600208341; Tue, 6 May 2025 09:02:56 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 66F0611D1; Tue, 6 May 2025 12:02:55 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 34731156E; Tue, 6 May 2025 12:01:20 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 227AF11BA; Tue, 6 May 2025 12:01:15 -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 A8912156C for ; Tue, 6 May 2025 12:00:58 -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-13-tH7YCVfNPEilOqtSum9mCw-1; Tue, 06 May 2025 12:00:55 -0400 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7A13618011EA; Tue, 6 May 2025 16:00:53 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.127]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1394F1956094; Tue, 6 May 2025 16:00:49 +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=1746547258; 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=Xo05lY5KnySYsgcnHgqr72FVz/A1D9I+knDpmVy/eqw=; b=c0oYl3pMiWQ53tPeNviNeyUByM+fUxoWgesV/mhkMza4LLzJxP/2/nMIlPL9QOtQeJEgg5 FvWGV1CpHyd4WOq1+BCDUba4Rxj2SchCewarTgBr/z980M3iyFRvuYSyxpiKKHc9XSGHoV hpp0whLforoxSUj2EERdebrKdskwCng= X-MC-Unique: tH7YCVfNPEilOqtSum9mCw-1 X-Mimecast-MFC-AGG-ID: tH7YCVfNPEilOqtSum9mCw_1746547253 To: qemu-devel@nongnu.org Subject: [PATCH v3 5/5] include/hw/boards: add warning about changing deprecation logic Date: Tue, 6 May 2025 17:00:24 +0100 Message-ID: <20250506160024.2380244-6-berrange@redhat.com> In-Reply-To: <20250506160024.2380244-1-berrange@redhat.com> References: <20250506160024.2380244-1-berrange@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: 6NQ7I47G5JTURKMUUHB4LWIC3X7GEKXL X-Message-ID-Hash: 6NQ7I47G5JTURKMUUHB4LWIC3X7GEKXL 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 , "Michael S. Tsirkin" , devel@lists.libvirt.org, Marcel Apfelbaum , Zhao Liu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Thomas Huth , Peter Maydell , John Snow 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: 1746547378235019000 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. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michael S. Tsirkin Tested-by: Philippe Mathieu-Daud=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