Commit 1392617d3576 intended to tag pseries-2.1 - 2.11 machines as deprecated with reasons mentioned in its commit log. Removing pseries-2.6 specific code with this patch for now.
Suggested-by: Cédric Le Goater <c...@kaod.org> Reviewed-by: Cédric Le Goater <c...@redhat.com> Signed-off-by: Harsh Prateek Bora <hars...@linux.ibm.com> --- hw/ppc/spapr.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f63843d107..a9c988b8f6 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -5278,24 +5278,6 @@ static void spapr_machine_2_7_class_options(MachineClass *mc) DEFINE_SPAPR_MACHINE(2, 7); -/* - * pseries-2.6 - */ - -static void spapr_machine_2_6_class_options(MachineClass *mc) -{ - static GlobalProperty compat[] = { - { TYPE_SPAPR_PCI_HOST_BRIDGE, "ddw", "off" }, - }; - - spapr_machine_2_7_class_options(mc); - mc->has_hotpluggable_cpus = false; - compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); -} - -DEFINE_SPAPR_MACHINE(2, 6); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); -- 2.45.2