| Message ID | 20231214174354.1514320-1-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | spapr: Tag pseries-2.1 - 2.11 machines as deprecated | expand |
On 14/12/2023 18.43, Cédric Le Goater wrote: > pseries machines before version 2.11 have undergone many changes to > correct issues, mostly regarding migration compatibility. This is > obfuscating the code uselessly and makes maintenance more difficult. > Remove them and only keep the last version of the 2.x series, 2.12, > still in use by old distros. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > docs/about/deprecated.rst | 7 +++++++ > hw/ppc/spapr.c | 1 + > 2 files changed, 8 insertions(+) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 2e1504024658..9ceef6ec2a8d 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -269,6 +269,13 @@ Nios II ``10m50-ghrd`` and ``nios2-generic-nommu`` machines (since 8.2) > > The Nios II architecture is orphan. > > +``pseries-2.1`` up to ``pseries-2.11`` (since 9.0) > +''''''''''''''''''''''''''''''''''''''''''''''''''''' The underline does not match the subtitle length... with that fixed: Reviewed-by: Thomas Huth <thuth@redhat.com> > +Older pseries machines before version 2.12 have undergone many changes > +to correct issues, mostly regarding migration compatibility. These are > +no longer maintained and removing them will make the code easier to > +read and maintain. Use versions 2.12 and above as a replacement. > > Backend options > --------------- > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index df09aa9d6a00..5034461399d2 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -5083,6 +5083,7 @@ static void spapr_machine_2_11_class_options(MachineClass *mc) > spapr_machine_2_12_class_options(mc); > smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON; > compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); > + mc->deprecation_reason = "old and not maintained - use a 2.12+ version"; > } > > DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
On 12/14/23 18:58, Thomas Huth wrote: > On 14/12/2023 18.43, Cédric Le Goater wrote: >> pseries machines before version 2.11 have undergone many changes to >> correct issues, mostly regarding migration compatibility. This is >> obfuscating the code uselessly and makes maintenance more difficult. >> Remove them and only keep the last version of the 2.x series, 2.12, >> still in use by old distros. >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- >> docs/about/deprecated.rst | 7 +++++++ >> hw/ppc/spapr.c | 1 + >> 2 files changed, 8 insertions(+) >> >> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst >> index 2e1504024658..9ceef6ec2a8d 100644 >> --- a/docs/about/deprecated.rst >> +++ b/docs/about/deprecated.rst >> @@ -269,6 +269,13 @@ Nios II ``10m50-ghrd`` and ``nios2-generic-nommu`` machines (since 8.2) >> The Nios II architecture is orphan. >> +``pseries-2.1`` up to ``pseries-2.11`` (since 9.0) >> +''''''''''''''''''''''''''''''''''''''''''''''''''''' > > The underline does not match the subtitle length... with that fixed: ah drat. I will resend. Thanks, C. > > Reviewed-by: Thomas Huth <thuth@redhat.com> > > >> +Older pseries machines before version 2.12 have undergone many changes >> +to correct issues, mostly regarding migration compatibility. These are >> +no longer maintained and removing them will make the code easier to >> +read and maintain. Use versions 2.12 and above as a replacement. >> Backend options >> --------------- >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index df09aa9d6a00..5034461399d2 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -5083,6 +5083,7 @@ static void spapr_machine_2_11_class_options(MachineClass *mc) >> spapr_machine_2_12_class_options(mc); >> smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON; >> compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); >> + mc->deprecation_reason = "old and not maintained - use a 2.12+ version"; >> } >> DEFINE_SPAPR_MACHINE(2_11, "2.11", false); >
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 2e1504024658..9ceef6ec2a8d 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -269,6 +269,13 @@ Nios II ``10m50-ghrd`` and ``nios2-generic-nommu`` machines (since 8.2) The Nios II architecture is orphan. +``pseries-2.1`` up to ``pseries-2.11`` (since 9.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Older pseries machines before version 2.12 have undergone many changes +to correct issues, mostly regarding migration compatibility. These are +no longer maintained and removing them will make the code easier to +read and maintain. Use versions 2.12 and above as a replacement. Backend options --------------- diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index df09aa9d6a00..5034461399d2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5083,6 +5083,7 @@ static void spapr_machine_2_11_class_options(MachineClass *mc) spapr_machine_2_12_class_options(mc); smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON; compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); + mc->deprecation_reason = "old and not maintained - use a 2.12+ version"; } DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
pseries machines before version 2.11 have undergone many changes to correct issues, mostly regarding migration compatibility. This is obfuscating the code uselessly and makes maintenance more difficult. Remove them and only keep the last version of the 2.x series, 2.12, still in use by old distros. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- docs/about/deprecated.rst | 7 +++++++ hw/ppc/spapr.c | 1 + 2 files changed, 8 insertions(+)