hw/i386/pc: Remove deprecated pc-q35-4.0[.1] and pc-i440fx-4.0 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: <20260307154202.86309-2-philmd@linaro.org>
Philippe Mathieu-Daudé committed
Apr 29, 2025 at 17:51 UTC
75afdc1047fb40f31975ff41a5f5909bf27f3af7
2 files changed
-36
hw/i386/pc_piix.c
-11
@@ -644,17 +644,6 @@ static void pc_i440fx_machine_4_1_options(MachineClass *m)
644
645
DEFINE_I440FX_MACHINE(4, 1);
646
647
-static void pc_i440fx_machine_4_0_options(MachineClass *m)
648
-{
649
- PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
650
- pc_i440fx_machine_4_1_options(m);
651
- pcmc->default_cpu_version = CPU_VERSION_LEGACY;
652
- compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
653
- compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
654
-}
655
-
656
-DEFINE_I440FX_MACHINE(4, 0);
657
-
647
#ifdef CONFIG_XEN
648
static void xenfv_machine_4_2_options(MachineClass *m)
649
{
hw/i386/pc_q35.c
-25
@@ -575,28 +575,3 @@ static void pc_q35_machine_4_1_options(MachineClass *m)
575
}
576
577
DEFINE_Q35_MACHINE(4, 1);
578
-
579
-static void pc_q35_machine_4_0_1_options(MachineClass *m)
580
-{
581
- PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
582
- pc_q35_machine_4_1_options(m);
583
- pcmc->default_cpu_version = CPU_VERSION_LEGACY;
584
- /*
585
- * This is the default machine for the 4.0-stable branch. It is basically
586
- * a 4.0 that doesn't use split irqchip by default. It MUST hence apply the
587
- * 4.0 compat props.
588
- */
589
- compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
590
- compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
591
-}
592
-
593
-DEFINE_Q35_MACHINE_BUGFIX(4, 0, 1);
594
-
595
-static void pc_q35_machine_4_0_options(MachineClass *m)
596
-{
597
- pc_q35_machine_4_0_1_options(m);
598
- m->default_kernel_irqchip_split = true;
599
- /* Compat props are applied by the 4.0.1 machine */
600
-}
601
-
602
-DEFINE_Q35_MACHINE(4, 0);