From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 406F1C369DC for ; Tue, 29 Apr 2025 15:06:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9mXS-0000YN-4f; Tue, 29 Apr 2025 11:06:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9mXP-0000Vo-O7 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:06:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9mXM-00013j-L3 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:06:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745939177; h=from:from:reply-to: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=dwaK0IxC2pbqVeQMmGXI6esESj6Xw708dRuZw0V6WIo=; b=WmjcmStdGqGPaixbUtmiZbiA+FiGEqu0OFqUkA/9MwvNk/4Q2G6vXe1iQ5tI20fNh59YvG tfjOsZcUbheBL6k78pK9YttzW/Ltiu9Uxl8djc9zydNvDMRUj49ZjUWU0R8opykqpfB0hG 7gNWYD6zWbyZH8VWFMSA2mxKErQP3ms= 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-664-qCCk8-wiNIK8yO7R2mqc9Q-1; Tue, 29 Apr 2025 11:06:08 -0400 X-MC-Unique: qCCk8-wiNIK8yO7R2mqc9Q-1 X-Mimecast-MFC-AGG-ID: qCCk8-wiNIK8yO7R2mqc9Q_1745939167 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 1860D1800A0D; Tue, 29 Apr 2025 15:06:07 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.98]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 08D9918001D7; Tue, 29 Apr 2025 15:06:03 +0000 (UTC) Date: Tue, 29 Apr 2025 16:06:01 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Thomas Huth Cc: qemu-devel@nongnu.org, Marcel Apfelbaum , Yanan Wang , John Snow , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , devel@lists.libvirt.org, Peter Maydell , Eduardo Habkost , Zhao Liu , "Michael S. Tsirkin" Subject: Re: [PATCH v2 1/5] Revert "include/hw: temporarily disable deletion of versioned machine types" Message-ID: References: <20250429131526.1842130-1-berrange@redhat.com> <20250429131526.1842130-2-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.2.14 (2025-02-20) X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.489, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Tue, Apr 29, 2025 at 04:30:56PM +0200, Thomas Huth wrote: > On 29/04/2025 15.15, Daniel P. Berrangé wrote: > > 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 > > typo: Startnig > > > 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é > > --- > > 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 >= 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 == 10 && \ > > - QEMU_VERSION_MINOR >= 1)) { \ > > - return; \ > > - } \ > > + return; \ > > I wonder whether we might want to have it the other way round now instead, > so that we could re-activate the dead machines in case a certain environment > variable (QEMU_ZOMBI_MACHINES) is set? Anyway, just an idea, not sure > whether it's a good one. So for this patch: Well we should have followup patch(s) to actually delete the now unused machine code, so ideally there will be no machines that could be re-activated. > > Reviewed-by: Thomas Huth > > > > } \ > > } while (0) > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|