On 10/1/24 11:29, Harsh Prateek Bora wrote:
> Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as
> deprecated with reasons mentioned in its commit log.
> Removing pseries-2.2 specific code with this patch for now.
>
> Suggested-by: Cédric Le Goater <clg@kaod.org>
> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/ppc/spapr.c | 17 -----------------
> 1 file changed, 17 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index ec906e1d77..3c7d251356 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5364,23 +5364,6 @@ static void spapr_machine_2_3_class_options(MachineClass *mc)
> }
> DEFINE_SPAPR_MACHINE(2, 3);
>
> -/*
> - * pseries-2.2
> - */
> -
> -static void spapr_machine_2_2_class_options(MachineClass *mc)
> -{
> - static GlobalProperty compat[] = {
> - { TYPE_SPAPR_PCI_HOST_BRIDGE, "mem_win_size", "0x20000000" },
Keep in mind that when the pseries-2.7 machine will be removed later in
this patchset, more cleanup could be done in spapr_phb_realize().
Thanks,
C.
> - };
> -
> - spapr_machine_2_3_class_options(mc);
> - compat_props_add(mc->compat_props, hw_compat_2_2, hw_compat_2_2_len);
> - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> - mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on";
> -}
> -DEFINE_SPAPR_MACHINE(2, 2);
> -
> static void spapr_machine_register_types(void)
> {
> type_register_static(&spapr_machine_info);