| Message ID | 20241014122729.1136809-13-harshpb@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | ppc/spapr: remove deprecated machines specific code | expand |
On 10/14/24 14:27, Harsh Prateek Bora wrote: > Commit 0cac0f1b964 marked pseries-2.12 machines as deprecated > with reasons mentioned in its commit log. > Removing pseries-2.12-sxxm specific code with this patch. > > 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 | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index faf88a177b..aba0ad26f1 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4731,8 +4731,6 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > DEFINE_SPAPR_MACHINE_IMPL(true, major, minor) > #define DEFINE_SPAPR_MACHINE(major, minor) \ > DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) > -#define DEFINE_SPAPR_MACHINE_TAGGED(major, minor, tag) \ > - DEFINE_SPAPR_MACHINE_IMPL(false, major, minor, _, tag) > > /* > * pseries-9.2 > @@ -5042,18 +5040,6 @@ static void spapr_machine_2_12_class_options(MachineClass *mc) > > DEFINE_SPAPR_MACHINE(2, 12); > > -static void spapr_machine_2_12_sxxm_class_options(MachineClass *mc) > -{ > - SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc); > - > - spapr_machine_2_12_class_options(mc); > - smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_WORKAROUND; > - smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_WORKAROUND; > - smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_FIXED_CCD; > -} > - > -DEFINE_SPAPR_MACHINE_TAGGED(2, 12, sxxm); > - > 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 faf88a177b..aba0ad26f1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4731,8 +4731,6 @@ static void spapr_machine_latest_class_options(MachineClass *mc) DEFINE_SPAPR_MACHINE_IMPL(true, major, minor) #define DEFINE_SPAPR_MACHINE(major, minor) \ DEFINE_SPAPR_MACHINE_IMPL(false, major, minor) -#define DEFINE_SPAPR_MACHINE_TAGGED(major, minor, tag) \ - DEFINE_SPAPR_MACHINE_IMPL(false, major, minor, _, tag) /* * pseries-9.2 @@ -5042,18 +5040,6 @@ static void spapr_machine_2_12_class_options(MachineClass *mc) DEFINE_SPAPR_MACHINE(2, 12); -static void spapr_machine_2_12_sxxm_class_options(MachineClass *mc) -{ - SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc); - - spapr_machine_2_12_class_options(mc); - smc->default_caps.caps[SPAPR_CAP_CFPC] = SPAPR_CAP_WORKAROUND; - smc->default_caps.caps[SPAPR_CAP_SBBC] = SPAPR_CAP_WORKAROUND; - smc->default_caps.caps[SPAPR_CAP_IBS] = SPAPR_CAP_FIXED_CCD; -} - -DEFINE_SPAPR_MACHINE_TAGGED(2, 12, sxxm); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info);
Commit 0cac0f1b964 marked pseries-2.12 machines as deprecated with reasons mentioned in its commit log. Removing pseries-2.12-sxxm specific code with this patch. Suggested-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com> --- hw/ppc/spapr.c | 14 -------------- 1 file changed, 14 deletions(-)