| Message ID | 20250508133550.81391-2-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines | expand |
On Thu, 8 May 2025 15:35:24 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > 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. if these machine types are the last users of compat arrays, it's better to remove array at the same time, aka squash those patches later in series into this one. That leaves no illusion that compats could be used in the later patches. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> > --- > hw/i386/pc_piix.c | 14 -------------- > hw/i386/pc_q35.c | 14 -------------- > 2 files changed, 28 deletions(-) > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 7a62bb06500..98a118fd4a0 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -764,20 +764,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_ISAPC > static void isapc_machine_options(MachineClass *m) > { > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 33211b1876f..b7ffb5f1216 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -658,17 +658,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);
On 09/05/2025 17.23, Igor Mammedov wrote: > On Thu, 8 May 2025 15:35:24 +0200 > Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > >> 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. > > if these machine types are the last users of compat arrays, > it's better to remove array at the same time, aka squash > those patches later in series into this one. > That leaves no illusion that compats could be used in the later patches. IMHO the generic hw_compat array should be treated separately since this is independent from x86. So in case someone ever needs to backport these patches to an older branch, they can decide more easily whether they want to apply the generic hw_compat part or only the x86-specific part of this series. Thomas
On 2/6/25 08:13, Thomas Huth wrote: > On 09/05/2025 17.23, Igor Mammedov wrote: >> On Thu, 8 May 2025 15:35:24 +0200 >> Philippe Mathieu-Daudé <philmd@linaro.org> wrote: >> >>> 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. >> >> if these machine types are the last users of compat arrays, >> it's better to remove array at the same time, aka squash >> those patches later in series into this one. >> That leaves no illusion that compats could be used in the later patches. > > IMHO the generic hw_compat array should be treated separately since this > is independent from x86. So in case someone ever needs to backport these > patches to an older branch, they can decide more easily whether they > want to apply the generic hw_compat part or only the x86-specific part > of this series. Yes, it is clearer this way than squashed.
On Mon, 2 Jun 2025 10:53:19 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > On 2/6/25 08:13, Thomas Huth wrote: > > On 09/05/2025 17.23, Igor Mammedov wrote: > >> On Thu, 8 May 2025 15:35:24 +0200 > >> Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > >> > >>> 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. > >> > >> if these machine types are the last users of compat arrays, > >> it's better to remove array at the same time, aka squash > >> those patches later in series into this one. > >> That leaves no illusion that compats could be used in the later patches. > > > > IMHO the generic hw_compat array should be treated separately since this > > is independent from x86. So in case someone ever needs to backport these > > patches to an older branch, they can decide more easily whether they > > want to apply the generic hw_compat part or only the x86-specific part > > of this series. > > Yes, it is clearer this way than squashed. ok, let's leave it as is. >
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7a62bb06500..98a118fd4a0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -764,20 +764,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_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 33211b1876f..b7ffb5f1216 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -658,17 +658,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);