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.5 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>
> ---
> hw/ppc/spapr.c | 19 -------------------
> 1 file changed, 19 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 9e78f94ec2..a38d4e098a 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -5315,25 +5315,6 @@ static void spapr_machine_2_6_class_options(MachineClass *mc)
>
> DEFINE_SPAPR_MACHINE(2, 6);
>
> -/*
> - * pseries-2.5
> - */
> -
> -static void spapr_machine_2_5_class_options(MachineClass *mc)
> -{
> - SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
> - static GlobalProperty compat[] = {
> - { "spapr-vlan", "use-rx-buffer-pools", "off" },
> - };
> -
> - spapr_machine_2_6_class_options(mc);
> - smc->use_ohci_by_default = true;
I would drop use_ohci_by_default also.
Thanks,
C.
> - compat_props_add(mc->compat_props, hw_compat_2_5, hw_compat_2_5_len);
> - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
> -}
> -
> -DEFINE_SPAPR_MACHINE(2, 5);
> -
> static void spapr_machine_register_types(void)
> {
> type_register_static(&spapr_machine_info);