Browse Source

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
ce80c4fa6f "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>
staging^2
Philippe Mathieu-Daudé 11 months ago
parent
commit
75afdc1047
  1. 11
      hw/i386/pc_piix.c
  2. 25
      hw/i386/pc_q35.c

11
hw/i386/pc_piix.c

@ -644,17 +644,6 @@ static void pc_i440fx_machine_4_1_options(MachineClass *m)
DEFINE_I440FX_MACHINE(4, 1);
static void pc_i440fx_machine_4_0_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_machine_4_1_options(m);
pcmc->default_cpu_version = CPU_VERSION_LEGACY;
compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
}
DEFINE_I440FX_MACHINE(4, 0);
#ifdef CONFIG_XEN
static void xenfv_machine_4_2_options(MachineClass *m)
{

25
hw/i386/pc_q35.c

@ -575,28 +575,3 @@ static void pc_q35_machine_4_1_options(MachineClass *m)
}
DEFINE_Q35_MACHINE(4, 1);
static void pc_q35_machine_4_0_1_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_machine_4_1_options(m);
pcmc->default_cpu_version = CPU_VERSION_LEGACY;
/*
* This is the default machine for the 4.0-stable branch. It is basically
* a 4.0 that doesn't use split irqchip by default. It MUST hence apply the
* 4.0 compat props.
*/
compat_props_add(m->compat_props, hw_compat_4_0, hw_compat_4_0_len);
compat_props_add(m->compat_props, pc_compat_4_0, pc_compat_4_0_len);
}
DEFINE_Q35_MACHINE_BUGFIX(4, 0, 1);
static void pc_q35_machine_4_0_options(MachineClass *m)
{
pc_q35_machine_4_0_1_options(m);
m->default_kernel_irqchip_split = true;
/* Compat props are applied by the 4.0.1 machine */
}
DEFINE_Q35_MACHINE(4, 0);

Loading…
Cancel
Save