| Message ID | 20241007153838.1085522-6-harshpb@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | ppc/spapr: remove deprecated machines specific code | expand |
On 10/7/24 17: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.5 specific code with this patch for now. > > Also drop sPAPRMachineClass::use_ohci_by_default which is now useless. > > 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. > --- > include/hw/ppc/spapr.h | 1 - > hw/ppc/spapr.c | 25 +------------------------ > 2 files changed, 1 insertion(+), 25 deletions(-) > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 1821ef96c7..6e9e62386c 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -143,7 +143,6 @@ struct SpaprMachineClass { > /*< public >*/ > bool dr_phb_enabled; /* enable dynamic-reconfig/hotplug of PHBs */ > bool update_dt_enabled; /* enable KVMPPC_H_UPDATE_DT */ > - bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ > bool pre_2_10_has_unused_icps; > bool legacy_irq_allocation; > uint32_t nr_xirqs; > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 4d7705c89f..f63843d107 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -3070,11 +3070,7 @@ static void spapr_machine_init(MachineState *machine) > } > > if (machine->usb) { > - if (smc->use_ohci_by_default) { > - pci_create_simple(phb->bus, -1, "pci-ohci"); > - } else { > - pci_create_simple(phb->bus, -1, "nec-usb-xhci"); > - } > + pci_create_simple(phb->bus, -1, "nec-usb-xhci"); > > if (has_vga) { > USBBus *usb_bus; > @@ -5300,25 +5296,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; > - 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);
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 1821ef96c7..6e9e62386c 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -143,7 +143,6 @@ struct SpaprMachineClass { /*< public >*/ bool dr_phb_enabled; /* enable dynamic-reconfig/hotplug of PHBs */ bool update_dt_enabled; /* enable KVMPPC_H_UPDATE_DT */ - bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ bool pre_2_10_has_unused_icps; bool legacy_irq_allocation; uint32_t nr_xirqs; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4d7705c89f..f63843d107 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3070,11 +3070,7 @@ static void spapr_machine_init(MachineState *machine) } if (machine->usb) { - if (smc->use_ohci_by_default) { - pci_create_simple(phb->bus, -1, "pci-ohci"); - } else { - pci_create_simple(phb->bus, -1, "nec-usb-xhci"); - } + pci_create_simple(phb->bus, -1, "nec-usb-xhci"); if (has_vga) { USBBus *usb_bus; @@ -5300,25 +5296,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; - 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);
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. Also drop sPAPRMachineClass::use_ohci_by_default which is now useless. Suggested-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com> --- include/hw/ppc/spapr.h | 1 - hw/ppc/spapr.c | 25 +------------------------ 2 files changed, 1 insertion(+), 25 deletions(-)