This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- hw/ppc/spapr.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index feb1e78b7c0..e861a2e7466 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -4968,33 +4968,6 @@ static void spapr_machine_4_1_class_options(MachineClass *mc) DEFINE_SPAPR_MACHINE(4, 1); -/* - * pseries-4.0 - */ -static bool phb_placement_4_0(SpaprMachineState *spapr, uint32_t index, - uint64_t *buid, hwaddr *pio, - hwaddr *mmio32, hwaddr *mmio64, - unsigned n_dma, uint32_t *liobns, Error **errp) -{ - if (!spapr_phb_placement(spapr, index, buid, pio, mmio32, mmio64, n_dma, - liobns, errp)) { - return false; - } - return true; -} -static void spapr_machine_4_0_class_options(MachineClass *mc) -{ - SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc); - - spapr_machine_4_1_class_options(mc); - compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); - smc->phb_placement = phb_placement_4_0; - smc->irq = &spapr_irq_xics; - smc->pre_4_1_migration = true; -} - -DEFINE_SPAPR_MACHINE(4, 0); - static void spapr_machine_register_types(void) { type_register_static(&spapr_machine_info); -- 2.51.0
