From: Cédric Le Goater Date: Tue, 23 Jan 2024 06:37:02 +0000 (+1000) Subject: spapr: Tag pseries-2.1 - 2.11 machines as deprecated X-Git-Tag: v9.0.0-rc0~52^2~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1392617d35765d5d912625fbb5cab1ffbed8e140;p=thirdparty%2Fqemu.git spapr: Tag pseries-2.1 - 2.11 machines as deprecated 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. Reviewed-by: Thomas Huth Reviewed-by: Daniel Henrique Barboza Signed-off-by: Cédric Le Goater Signed-off-by: Nicholas Piggin --- diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 5a2305ccd6f..36bd3e15ef0 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -229,6 +229,14 @@ The Nios II architecture is orphan. The machine is no longer in existence and has been long unmaintained in QEMU. This also holds for the TC51828 16MiB flash that it uses. +``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 b442d18317e..d1c6d70d8d0 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/roms/skiboot b/roms/skiboot index dbd5de6624d..24a7eb35966 160000 --- a/roms/skiboot +++ b/roms/skiboot @@ -1 +1 @@ -Subproject commit dbd5de6624d7466bb67d1eb4e57bc3a8e2ad9e87 +Subproject commit 24a7eb35966d93455520bc2debdd7954314b638b