hw/i386/pc: Remove deprecated pc-q35/pc-i440fx/xenfv 3.1 machines
These machines 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") they can now be removed. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20260309145013.44327-2-philmd@linaro.org>
Philippe Mathieu-Daudé committed
Apr 29, 2025 at 16:45 UTC
7d2778dea32a4924a469f1cc5767042c8f5b4eea
2 files changed
-39
hw/i386/pc_piix.c
-25
@@ -655,19 +655,6 @@ static void pc_i440fx_machine_4_0_options(MachineClass *m)
655
656
DEFINE_I440FX_MACHINE(4, 0);
657
658
-static void pc_i440fx_machine_3_1_options(MachineClass *m)
659
-{
660
- PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
661
-
662
- pc_i440fx_machine_4_0_options(m);
663
- m->smbus_no_migration_support = true;
664
- pcmc->pvh_enabled = false;
665
- compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len);
666
- compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
667
-}
668
-
669
-DEFINE_I440FX_MACHINE(3, 1);
670
-
658
#ifdef CONFIG_XEN
659
static void xenfv_machine_4_2_options(MachineClass *m)
660
{
@@ -679,16 +666,4 @@ static void xenfv_machine_4_2_options(MachineClass *m)
666
667
DEFINE_PC_MACHINE(xenfv_4_2, "xenfv-4.2", pc_xen_hvm_init,
668
xenfv_machine_4_2_options);
682
-
683
-static void xenfv_machine_3_1_options(MachineClass *m)
684
-{
685
- pc_i440fx_machine_3_1_options(m);
686
- m->desc = "Xen Fully-virtualized PC";
687
- m->alias = "xenfv";
688
- m->max_cpus = HVM_MAX_VCPUS;
689
- m->default_machine_opts = "accel=xen,suppress-vmdesc=on";
690
-}
691
-
692
-DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init,
693
- xenfv_machine_3_1_options);
669
#endif
hw/i386/pc_q35.c
-14
@@ -600,17 +600,3 @@ static void pc_q35_machine_4_0_options(MachineClass *m)
600
}
601
602
DEFINE_Q35_MACHINE(4, 0);
603
-
604
-static void pc_q35_machine_3_1_options(MachineClass *m)
605
-{
606
- PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
607
-
608
- pc_q35_machine_4_0_options(m);
609
- m->default_kernel_irqchip_split = false;
610
- m->smbus_no_migration_support = true;
611
- pcmc->pvh_enabled = false;
612
- compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len);
613
- compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
614
-}
615
-
616
-DEFINE_Q35_MACHINE(3, 1);