| Message ID | 20241007153838.1085522-2-harshpb@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | ppc/spapr: remove deprecated machines specific code | expand |
Hi Harsh, On 7/10/24 12:38, 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.1 specific code with this patch for now. > > Suggested-by: Cédric Le Goater <clg@kaod.org> > Reviewed-by: Cédric Le Goater <clg@redhat.com> > Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com> > --- > hw/ppc/spapr.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 2c10a70a48..e9518ff8b3 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -5381,17 +5381,6 @@ static void spapr_machine_2_2_class_options(MachineClass *mc) > } > DEFINE_SPAPR_MACHINE(2, 2); > > -/* > - * pseries-2.1 > - */ > - > -static void spapr_machine_2_1_class_options(MachineClass *mc) > -{ > - spapr_machine_2_2_class_options(mc); > - compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len); Why not remove hw_compat_2_1[] and hw_compat_2_1_len in the same patch? > -} > -DEFINE_SPAPR_MACHINE(2, 1); > - > static void spapr_machine_register_types(void) > { > type_register_static(&spapr_machine_info);
Hi Philippe, On 10/8/24 01:53, Philippe Mathieu-Daudé wrote: > Hi Harsh, > > On 7/10/24 12:38, 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.1 specific code with this patch for now. >> >> Suggested-by: Cédric Le Goater <clg@kaod.org> >> Reviewed-by: Cédric Le Goater <clg@redhat.com> >> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com> >> --- >> hw/ppc/spapr.c | 11 ----------- >> 1 file changed, 11 deletions(-) >> >> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >> index 2c10a70a48..e9518ff8b3 100644 >> --- a/hw/ppc/spapr.c >> +++ b/hw/ppc/spapr.c >> @@ -5381,17 +5381,6 @@ static void >> spapr_machine_2_2_class_options(MachineClass *mc) >> } >> DEFINE_SPAPR_MACHINE(2, 2); >> -/* >> - * pseries-2.1 >> - */ >> - >> -static void spapr_machine_2_1_class_options(MachineClass *mc) >> -{ >> - spapr_machine_2_2_class_options(mc); >> - compat_props_add(mc->compat_props, hw_compat_2_1, >> hw_compat_2_1_len); > > Why not remove hw_compat_2_1[] and hw_compat_2_1_len in the same patch? > Nice catch, somehow I missed it. Probably because I saw hw_compat_2_4 onwards are still shared by other machines. I shall remove the ones for which spapr remains the only consumer. Thanks Harsh >> -} >> -DEFINE_SPAPR_MACHINE(2, 1); >> - >> static void spapr_machine_register_types(void) >> { >> type_register_static(&spapr_machine_info); >
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2c10a70a48..e9518ff8b3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5381,17 +5381,6 @@ static void spapr_machine_2_2_class_options(MachineClass *mc) } DEFINE_SPAPR_MACHINE(2, 2); -/* - * pseries-2.1 - */ - -static void spapr_machine_2_1_class_options(MachineClass *mc) -{ - spapr_machine_2_2_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len); -} -DEFINE_SPAPR_MACHINE(2, 1); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info);