On Wed, 29 May 2024 07:15:17 +0200
Philippe Mathieu-Daudé <phi...@linaro.org> 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.12 machines.
>
> Suggested-by: Thomas Huth <th...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> Reviewed-by: Thomas Huth <th...@redhat.com>
> Reviewed-by: Zhao Liu <zhao1....@intel.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> ---
> 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 40585ca7d5..7ff52bdd8e 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -228,8 +228,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.12`` (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 ebb51de380..02878060d0 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -742,6 +742,7 @@ DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
> static void pc_i440fx_2_12_machine_options(MachineClass *m)
> {
> pc_i440fx_3_0_machine_options(m);
> + m->deprecation_reason = "old and unattended - use a newer version
> instead";
> compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len);
> compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len);
> }
> @@ -847,7 +848,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);
> }
