On Tue, Apr 16, 2024 at 08:59:17PM +0200, 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.12 machines.
>
> Suggested-by: Thomas Huth
> Signed-off-by: Philippe Mathieu-Daudé
> Reviewed-by: Thomas Huth
> Reviewed-by: Zhao Liu
> ---
> docs/about/deprecated.rst | 4 ++--
> hw/i386/pc_piix.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
FWIW, this patch is potentially obsolete if we go with enforcing a
general deprecation policy for all versioned machines:
https://lists.nongnu.org/archive/html/qemu-devel/2024-05/msg00084.html
If this series merges first though, that's fine. My proposal can
easily be rebased on top of this.
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 7b548519b5..47234da329 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.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 18ba076609..817d99c0ce 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -727,6 +727,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);
> }
> @@ -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);
> }
> --
> 2.41.0
> ___
> Devel mailing list -- de...@lists.libvirt.org
> To unsubscribe send an email to devel-le...@lists.libvirt.org
With regards,
Daniel
--
|: https://berrange.com -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|
