From: "Daniel P. Berrangé" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: qemu-devel@nongnu.org, Jason Wang <jasowang@redhat.com>,
Hanna Reitz <hreitz@redhat.com>,
Dmitry Fleytman <dmitry.fleytman@gmail.com>,
qemu-block@nongnu.org, Fam Zheng <fam@euphon.net>,
Paolo Bonzini <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Zhao Liu <zhao1.liu@intel.com>,
Yanan Wang <wangyanan55@huawei.com>,
Kevin Wolf <kwolf@redhat.com>,
Eduardo Habkost <eduardo@habkost.net>,
Richard Henderson <richard.henderson@linaro.org>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Gerd Hoffmann <kraxel@redhat.com>, John Snow <jsnow@redhat.com>
Subject: Re: [PATCH 02/21] hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines
Date: Thu, 16 Jan 2025 09:29:06 +0000 [thread overview]
Message-ID: <Z4jRYiUGAzz1_NRV@redhat.com> (raw)
In-Reply-To: <20250115232247.30364-3-philmd@linaro.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é <philmd@linaro.org>
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é <philmd@linaro.org>
> ---
> 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 :|
next prev parent reply other threads:[~2025-01-16 9:30 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-15 23:22 [PATCH 00/21] hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines Philippe Mathieu-Daudé
2025-01-15 23:22 ` [PATCH 01/21] hw/i386/pc: Remove unused pc_compat_2_3 declarations Philippe Mathieu-Daudé
2025-01-16 9:06 ` Daniel P. Berrangé
2025-01-16 18:06 ` Richard Henderson
2025-01-17 8:52 ` Thomas Huth
2025-01-30 9:59 ` Michael Tokarev
2025-01-30 10:27 ` Philippe Mathieu-Daudé
2025-01-15 23:22 ` [PATCH 02/21] hw/i386/pc: Remove deprecated pc-q35-2.4 and pc-i440fx-2.4 machines Philippe Mathieu-Daudé
2025-01-16 9:29 ` Daniel P. Berrangé [this message]
2025-01-16 10:33 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 03/21] hw/i386/pc: Remove PCMachineClass::broken_reserved_end field Philippe Mathieu-Daudé
2025-01-16 9:38 ` Daniel P. Berrangé
2025-01-17 8:55 ` Thomas Huth
2025-01-15 23:22 ` [PATCH 04/21] hw/i386/pc: Remove pc_compat_2_4[] array Philippe Mathieu-Daudé
2025-01-16 9:39 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 05/21] target/i386/cpu: Remove X86CPU::check_cpuid field Philippe Mathieu-Daudé
2025-01-16 9:46 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 06/21] target/i386/cpu: Pass Error** to x86_cpu_filter_features() Philippe Mathieu-Daudé
2025-01-16 9:51 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 07/21] hw/core/machine: Remove hw_compat_2_4[] array Philippe Mathieu-Daudé
2025-01-16 9:53 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 08/21] hw/net/e1000: Remove unused E1000_FLAG_MAC flag Philippe Mathieu-Daudé
2025-01-16 9:57 ` Daniel P. Berrangé
2025-01-17 8:58 ` Thomas Huth
2025-01-17 16:41 ` Philippe Mathieu-Daudé
2025-01-17 19:00 ` Thomas Huth
2025-01-15 23:22 ` [PATCH 09/21] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition Philippe Mathieu-Daudé
2025-01-16 10:01 ` Daniel P. Berrangé
2025-01-17 9:06 ` Thomas Huth
2025-04-29 13:50 ` Philippe Mathieu-Daudé
2025-01-15 23:22 ` [PATCH 10/21] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition Philippe Mathieu-Daudé
2025-01-16 10:06 ` Daniel P. Berrangé
2025-01-17 9:08 ` Thomas Huth
2025-01-17 16:43 ` Philippe Mathieu-Daudé
2025-01-17 18:43 ` Thomas Huth
2025-01-15 23:22 ` [PATCH 11/21] hw/i386/pc: Remove deprecated pc-q35-2.5 and pc-i440fx-2.5 machines Philippe Mathieu-Daudé
2025-01-16 10:34 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 12/21] hw/i386/x86: Remove X86MachineClass::save_tsc_khz field Philippe Mathieu-Daudé
2025-01-16 10:08 ` Daniel P. Berrangé
2025-01-17 9:09 ` Thomas Huth
2025-01-15 23:22 ` [PATCH 13/21] hw/nvram/fw_cfg: Remove legacy FW_CFG_ORDER_OVERRIDE Philippe Mathieu-Daudé
2025-01-16 10:13 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 14/21] hw/core/machine: Remove hw_compat_2_5[] array Philippe Mathieu-Daudé
2025-01-16 10:16 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 15/21] hw/block/fdc-isa: Remove 'fallback' property Philippe Mathieu-Daudé
2025-01-16 10:16 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 16/21] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_OLD_PCI_CONFIGURATION definition Philippe Mathieu-Daudé
2025-01-16 10:17 ` Daniel P. Berrangé
2025-01-17 9:16 ` Thomas Huth
2025-04-29 13:56 ` Philippe Mathieu-Daudé
2025-01-15 23:22 ` [PATCH 17/21] hw/scsi/vmw_pvscsi: Remove PVSCSI_COMPAT_DISABLE_PCIE_BIT definition Philippe Mathieu-Daudé
2025-01-16 10:18 ` Daniel P. Berrangé
2025-01-17 9:21 ` Thomas Huth
2025-04-29 14:04 ` Philippe Mathieu-Daudé
2025-01-17 9:24 ` Thomas Huth
2025-01-15 23:22 ` [PATCH 18/21] hw/scsi/vmw_pvscsi: Convert DeviceRealize -> InstanceInit Philippe Mathieu-Daudé
2025-01-16 10:19 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 19/21] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS definition Philippe Mathieu-Daudé
2025-01-16 10:19 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 20/21] hw/net/vmxnet3: Remove VMXNET3_COMPAT_FLAG_DISABLE_PCIE definition Philippe Mathieu-Daudé
2025-01-16 10:20 ` Daniel P. Berrangé
2025-01-15 23:22 ` [PATCH 21/21] hw/net/vmxnet3: Merge DeviceRealize in InstanceInit Philippe Mathieu-Daudé
2025-01-16 10:20 ` Daniel P. Berrangé
2025-01-17 10:37 ` [PATCH 00/21] hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines Michael S. Tsirkin
2025-01-17 16:46 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z4jRYiUGAzz1_NRV@redhat.com \
--to=berrange@redhat.com \
--cc=dmitry.fleytman@gmail.com \
--cc=eduardo@habkost.net \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=jasowang@redhat.com \
--cc=jsnow@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=wangyanan55@huawei.com \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).