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 2106EC02180 for ; Thu, 16 Jan 2025 09:30:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYMC7-0001uX-Kx; Thu, 16 Jan 2025 04:29:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYMBu-0001tC-BJ for qemu-devel@nongnu.org; Thu, 16 Jan 2025 04:29:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYMBs-0007XB-1R for qemu-devel@nongnu.org; Thu, 16 Jan 2025 04:29:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737019765; 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=wdRGyQE/BBibsOCuPjVGPNs6nScWcx1EHGPXmGy4auY=; b=FdenC372CHkV/h7XhaxmDOT3MR9cy6bQBhUisCHyAfTfrlhe+Umz0qjwcznDdB2WrafOAc kZDlsNODk1TvRwz1Br23imFBS95ftNB+ij0LePVomY4z83ZBp6uIarjhCNUleGQv+T5xnB PKgZG1SGZf4RDoIlaWIP150ZCuKplUk= 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-608-8nSCX3rjOI6XACv4ITUGbQ-1; Thu, 16 Jan 2025 04:29:21 -0500 X-MC-Unique: 8nSCX3rjOI6XACv4ITUGbQ-1 X-Mimecast-MFC-AGG-ID: 8nSCX3rjOI6XACv4ITUGbQ Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 83F4D19560A1; Thu, 16 Jan 2025 09:29:19 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.111]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A56A2195608A; Thu, 16 Jan 2025 09:29:12 +0000 (UTC) Date: Thu, 16 Jan 2025 09:29:06 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: qemu-devel@nongnu.org, Jason Wang , Hanna Reitz , Dmitry Fleytman , qemu-block@nongnu.org, Fam Zheng , Paolo Bonzini , "Michael S. Tsirkin" , Zhao Liu , Yanan Wang , Kevin Wolf , Eduardo Habkost , Richard Henderson , Marcel Apfelbaum , Gerd Hoffmann , John Snow Subject: Re: [PATCH 02/21] hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines Message-ID: References: <20250115232247.30364-1-philmd@linaro.org> <20250115232247.30364-3-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250115232247.30364-3-philmd@linaro.org> User-Agent: Mutt/2.2.13 (2024-03-09) X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1.793, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 Thu, Jan 16, 2025 at 12:22:28AM +0100, Philippe Mathieu-Daudé wrote: > These machines has been supported for a period of more than 6 years. > According to our versioned machine support policy (see commit > ce80c4fa6ff "docs: document special exception for machine type > deprecation & removal") they can now be removed. Yes, but ...see commit c9fd2d9a48ee3c195cf83cc611b87b09f02f0013 [quote] The new deprecation and deletion policy for versioned machine types is being 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 automatic deletions (by skipping QOM registration) are temporarily gated on existance of the env variable "QEMU_DELETE_MACHINES" / QEMU version number >= 10.1.0. This allows opt-in testing of the automatic deletion logic, while activating it fully in QEMU >= 10.1.0. [/quote] IOW, we only intended to apply the "delete after 6 years" special rule for machine types from 10.1.0 onwards. Until then we should consider machine types to be following the general process, which was deprecate for 2 cycles, then delete in the 3rd cycle. You added these deprecations in: commit 792b4fdd4eb8197bd6eb9e80a1dfaf0cb3b54aeb Author: Philippe Mathieu-Daudé Date: Wed Feb 28 10:34:35 2024 +0100 hw/i386/pc: Deprecate 2.4 to 2.12 pc-i440fx machines Similarly to the commit c7437f0ddb "docs/about: Mark the old pc-i440fx-2.0 - 2.3 machine types as deprecated", deprecate the 2.4 to 2.12 machines. which IIUC was the 9.1.0 cycle too. So the new 3 year / 6 year policy applies, but the 6 year deletion policy was declared to NOT start until the 10.1.0 release cycle. So we are 1 release too early to start applying that deletion rule. > Signed-off-by: Philippe Mathieu-Daudé > --- > docs/about/removed-features.rst | 4 ++++ > hw/i386/pc_piix.c | 13 ------------- > hw/i386/pc_q35.c | 13 ------------- > 3 files changed, 4 insertions(+), 26 deletions(-) > > diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst > index c6616ce05e5..e4bdb385a25 100644 > --- a/docs/about/removed-features.rst > +++ b/docs/about/removed-features.rst > @@ -1012,6 +1012,10 @@ This machine has been renamed ``fuloong2e``. > These machine types were very old and likely could not be used for live > migration from old QEMU versions anymore. Use a newer machine type instead. > > +``pc-q35-2.4`` and `pc-i440fx-2.4` (removed in 10.0) > +'''''''''''''''''''''''''''''''''''''''''''''''''''' > +This versioned machine has been supported for a period of more than 6 years. > + > Raspberry Pi ``raspi2`` and ``raspi3`` machines (removed in 6.2) > '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 04d2957adcd..64c1ab5ff3f 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -780,19 +780,6 @@ static void pc_i440fx_machine_2_5_options(MachineClass *m) > > DEFINE_I440FX_MACHINE(2, 5); > > -static void pc_i440fx_machine_2_4_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - > - pc_i440fx_machine_2_5_options(m); > - m->hw_version = "2.4.0"; > - pcmc->broken_reserved_end = true; > - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); > - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); > -} > - > -DEFINE_I440FX_MACHINE(2, 4); > - > #ifdef CONFIG_ISAPC > static void isapc_machine_options(MachineClass *m) > { > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 77536dd697f..847f56263f3 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -674,16 +674,3 @@ static void pc_q35_machine_2_5_options(MachineClass *m) > } > > DEFINE_Q35_MACHINE(2, 5); > - > -static void pc_q35_machine_2_4_options(MachineClass *m) > -{ > - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > - > - pc_q35_machine_2_5_options(m); > - m->hw_version = "2.4.0"; > - pcmc->broken_reserved_end = true; > - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len); > - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len); > -} > - > -DEFINE_Q35_MACHINE(2, 4); > -- > 2.47.1 > > 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 :|