| Message ID | 20240416135252.8384-2-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386: Remove deprecated pc-i440fx-2.0 -> 2.3 machines | expand |
On 16/04/2024 15.52, Philippe Mathieu-Daudé wrote: > 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.7 machines. > > Suggested-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > docs/about/deprecated.rst | 4 ++-- > hw/i386/pc_piix.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 7b548519b5..967ee34267 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -219,8 +219,8 @@ deprecated; use the new name ``dtb-randomness`` instead. The new name > better reflects the way this property affects all random data within > the device tree blob, not just the ``kaslr-seed`` node. > > -``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) > -''''''''''''''''''''''''''''''''''''''''''''''''''''' > +``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.7`` (since 9.1) > +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' Didn't we want to mark everything up to 2.12 as deprecated? Anyway, Reviewed-by: Thomas Huth <thuth@redhat.com>
On 16/4/24 16:23, Thomas Huth wrote: > On 16/04/2024 15.52, Philippe Mathieu-Daudé wrote: >> 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.7 machines. >> >> Suggested-by: Thomas Huth <thuth@redhat.com> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> docs/about/deprecated.rst | 4 ++-- >> hw/i386/pc_piix.c | 2 +- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst >> index 7b548519b5..967ee34267 100644 >> --- a/docs/about/deprecated.rst >> +++ b/docs/about/deprecated.rst >> @@ -219,8 +219,8 @@ deprecated; use the new name ``dtb-randomness`` >> instead. The new name >> better reflects the way this property affects all random data within >> the device tree blob, not just the ``kaslr-seed`` node. >> -``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) >> -''''''''''''''''''''''''''''''''''''''''''''''''''''' >> +``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) and >> ``pc-i440fx-2.4`` up to ``pc-i440fx-2.7`` (since 9.1) >> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > Didn't we want to mark everything up to 2.12 as deprecated? I took your suggestion: https://lore.kernel.org/qemu-devel/2a01baa6-b6a3-4572-94cd-63b2eaab7b38@redhat.com/ I am happy to go up to 2.12 :) > Anyway, > Reviewed-by: Thomas Huth <thuth@redhat.com> Thanks!
On Tue, Apr 16, 2024 at 03:52:30PM +0200, Philippe Mathieu-Daudé wrote: > Date: Tue, 16 Apr 2024 15:52:30 +0200 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH v3 01/22] hw/i386/pc: Deprecate 2.4 to 2.7 pc-i440fx > machines > X-Mailer: git-send-email 2.41.0 > > 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.7 machines. > > Suggested-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > docs/about/deprecated.rst | 4 ++-- > hw/i386/pc_piix.c | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) LGTM, Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
On 16/04/2024 16.49, Philippe Mathieu-Daudé wrote: > On 16/4/24 16:23, Thomas Huth wrote: >> On 16/04/2024 15.52, Philippe Mathieu-Daudé wrote: >>> 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.7 machines. >>> >>> Suggested-by: Thomas Huth <thuth@redhat.com> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >>> --- >>> docs/about/deprecated.rst | 4 ++-- >>> hw/i386/pc_piix.c | 2 +- >>> 2 files changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst >>> index 7b548519b5..967ee34267 100644 >>> --- a/docs/about/deprecated.rst >>> +++ b/docs/about/deprecated.rst >>> @@ -219,8 +219,8 @@ deprecated; use the new name ``dtb-randomness`` >>> instead. The new name >>> better reflects the way this property affects all random data within >>> the device tree blob, not just the ``kaslr-seed`` node. >>> -``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) >>> -''''''''''''''''''''''''''''''''''''''''''''''''''''' >>> +``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) and >>> ``pc-i440fx-2.4`` up to ``pc-i440fx-2.7`` (since 9.1) >>> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' >> >> Didn't we want to mark everything up to 2.12 as deprecated? > > I took your suggestion: > https://lore.kernel.org/qemu-devel/2a01baa6-b6a3-4572-94cd-63b2eaab7b38@redhat.com/ > I am happy to go up to 2.12 :) I thought we discussed deprecating all machine types up to 2.12 on all targets when we discussed the ppc spapr machine type deprecation later ... but I cannot find that discussion anymore, maybe it was just on IRC ... Anyway, let's go with up to 2.12 if nobody complains! Thomas
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 7b548519b5..967ee34267 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -219,8 +219,8 @@ deprecated; use the new name ``dtb-randomness`` instead. The new name better reflects the way this property affects all random data within the device tree blob, not just the ``kaslr-seed`` node. -``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) -''''''''''''''''''''''''''''''''''''''''''''''''''''' +``pc-i440fx-2.0`` up to ``pc-i440fx-2.3`` (since 8.2) and ``pc-i440fx-2.4`` up to ``pc-i440fx-2.7`` (since 9.1) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' These old machine types are quite neglected nowadays and thus might have various pitfalls with regards to live migration. Use a newer machine type diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 18ba076609..ec9c299b06 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -778,6 +778,7 @@ DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL, static void pc_i440fx_2_7_machine_options(MachineClass *m) { pc_i440fx_2_8_machine_options(m); + m->deprecation_reason = "old and unattended - use a newer version instead"; compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); } @@ -832,7 +833,6 @@ static void pc_i440fx_2_3_machine_options(MachineClass *m) { pc_i440fx_2_4_machine_options(m); m->hw_version = "2.3.0"; - m->deprecation_reason = "old and unattended - use a newer version instead"; compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len); compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len); }
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.7 machines. Suggested-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- docs/about/deprecated.rst | 4 ++-- hw/i386/pc_piix.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)