From: Philippe Mathieu-Daudé Date: Thu, 8 Jan 2026 03:30:25 +0000 (+0800) Subject: hw/i386/pc: Remove deprecated pc-q35-2.6 and pc-i440fx-2.6 machines X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52d8e35bd1d2d248cd1bf5485c7311631d2376a2;p=thirdparty%2Fqemu.git hw/i386/pc: Remove deprecated pc-q35-2.6 and pc-i440fx-2.6 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. Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Zhao Liu Link: https://lore.kernel.org/r/20260108033051.777361-2-zhao1.liu@intel.com Signed-off-by: Paolo Bonzini --- diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 878db5721b..9efb42ad05 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -732,20 +732,6 @@ static void pc_i440fx_machine_2_7_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 7); -static void pc_i440fx_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug = true; - x86mc->fwcfg_dma_enabled = false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_I440FX_MACHINE(2, 6); - #ifdef CONFIG_XEN static void xenfv_machine_4_2_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 6e5a23d718..6dd1120c00 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -680,17 +680,3 @@ static void pc_q35_machine_2_7_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 7); - -static void pc_q35_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_q35_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug = true; - x86mc->fwcfg_dma_enabled = false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_Q35_MACHINE(2, 6);