diff options
| author | Harsh Prateek Bora <harshpb@linux.ibm.com> | 2024-10-14 17:57:21 +0530 |
|---|---|---|
| committer | Nicholas Piggin <npiggin@gmail.com> | 2024-11-04 09:10:25 +1000 |
| commit | 615ab788a56c1e9b9f2076143153baf2f8df9adb (patch) | |
| tree | 329279adf3b3a9072d8fe882010b9fb89c6e7d11 /hw/ppc | |
| parent | c447bb1ad4ead9ca8620f468b0324a338877f6bf (diff) | |
| download | qemu-615ab788a56c1e9b9f2076143153baf2f8df9adb.zip qemu-615ab788a56c1e9b9f2076143153baf2f8df9adb.tar.gz qemu-615ab788a56c1e9b9f2076143153baf2f8df9adb.tar.bz2 | |
ppc/spapr: remove deprecated machine pseries-2.5
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>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/spapr.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4d7705c..f63843d 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); |