On Thu, 8 May 2025 15:35:40 +0200
Philippe Mathieu-Daudé <phi...@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. Remove the qtest
> in test-x86-cpuid-compat.c file.
same comment as 1/27,
I'd squash pc|hw_compat_2_7 removal in here
other than that loos good to me, with above
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> Reviewed-by: Mark Cave-Ayland <mark.caveayl...@nutanix.com>
> Reviewed-by: Thomas Huth <th...@redhat.com>
> ---
> hw/i386/pc_piix.c | 9 ---------
> hw/i386/pc_q35.c | 10 ----------
> tests/qtest/test-x86-cpuid-compat.c | 11 -----------
> 3 files changed, 30 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 98a118fd4a0..98bd8d0e67b 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -755,15 +755,6 @@ static void pc_i440fx_machine_2_8_options(MachineClass
> *m)
>
> DEFINE_I440FX_MACHINE(2, 8);
>
> -static void pc_i440fx_machine_2_7_options(MachineClass *m)
> -{
> - pc_i440fx_machine_2_8_options(m);
> - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len);
> - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len);
> -}
> -
> -DEFINE_I440FX_MACHINE(2, 7);
> -
> #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 b7ffb5f1216..a1f46cd8f03 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -648,13 +648,3 @@ static void pc_q35_machine_2_8_options(MachineClass *m)
> }
>
> DEFINE_Q35_MACHINE(2, 8);
> -
> -static void pc_q35_machine_2_7_options(MachineClass *m)
> -{
> - pc_q35_machine_2_8_options(m);
> - m->max_cpus = 255;
> - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len);
> - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len);
> -}
> -
> -DEFINE_Q35_MACHINE(2, 7);
> diff --git a/tests/qtest/test-x86-cpuid-compat.c
> b/tests/qtest/test-x86-cpuid-compat.c
> index 456e2af6657..5e0547e81b7 100644
> --- a/tests/qtest/test-x86-cpuid-compat.c
> +++ b/tests/qtest/test-x86-cpuid-compat.c
> @@ -345,17 +345,6 @@ int main(int argc, char **argv)
>
> /* Check compatibility of old machine-types that didn't
> * auto-increase level/xlevel/xlevel2: */
> - if (qtest_has_machine("pc-i440fx-2.7")) {
> - add_cpuid_test("x86/cpuid/auto-level/pc-2.7",
> - "486", "arat=on,avx512vbmi=on,xsaveopt=on",
> - "pc-i440fx-2.7", "level", 1);
> - add_cpuid_test("x86/cpuid/auto-xlevel/pc-2.7",
> - "486", "3dnow=on,sse4a=on,invtsc=on,npt=on,svm=on",
> - "pc-i440fx-2.7", "xlevel", 0);
> - add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7",
> - "486", "xstore=on", "pc-i440fx-2.7",
> - "xlevel2", 0);
> - }
> if (qtest_has_machine("pc-i440fx-2.9")) {
> add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/off",
> "Conroe", NULL, "pc-i440fx-2.9",
