| Message ID | 20250115232247.30364-3-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines | expand |
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
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. > > 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(-) I'll give this: Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> on the basis that this patch series isn't added to a PULL until the 10.1.0 dev cycle opens. > > 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) > '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > We might be able to drop chunk this depending on discussion around Thomas' general docs patch With regards, Daniel
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);
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. 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(-)