On Mon, 12 May 2025 10:39:30 +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.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
> Reviewed-by: Thomas Huth <th...@redhat.com>
> Reviewed-by: Zhao Liu <zhao1....@intel.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> ---
> hw/i386/pc_piix.c | 13 -------------
> hw/i386/pc_q35.c | 13 -------------
> tests/qtest/test-x86-cpuid-compat.c | 14 --------------
> 3 files changed, 40 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 0dce512f184..04213b45b44 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -791,19 +791,6 @@ static void pc_i440fx_machine_2_5_options(MachineClass
> *m)
>
> DEFINE_I440FX_MACHINE(2, 5);
>
> -static void pc_i440fx_machine_2_4_options(MachineClass *m)
> -{
> - PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -
> - pc_i440fx_machine_2_5_options(m);
> - m->hw_version = "2.4.0";
> - pcmc->broken_reserved_end = true;
> - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len);
> - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len);
> -}
> -
> -DEFINE_I440FX_MACHINE(2, 4);
> -
> #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 c538b3d05b4..47e12602413 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -685,16 +685,3 @@ static void pc_q35_machine_2_5_options(MachineClass *m)
> }
>
> DEFINE_Q35_MACHINE(2, 5);
> -
> -static void pc_q35_machine_2_4_options(MachineClass *m)
> -{
> - PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
> -
> - pc_q35_machine_2_5_options(m);
> - m->hw_version = "2.4.0";
> - pcmc->broken_reserved_end = true;
> - compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len);
> - compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len);
> -}
> -
> -DEFINE_Q35_MACHINE(2, 4);
> diff --git a/tests/qtest/test-x86-cpuid-compat.c
> b/tests/qtest/test-x86-cpuid-compat.c
> index c9de47bb269..456e2af6657 100644
> --- a/tests/qtest/test-x86-cpuid-compat.c
> +++ b/tests/qtest/test-x86-cpuid-compat.c
> @@ -365,20 +365,6 @@ int main(int argc, char **argv)
> "level", 10);
> }
>
> - /*
> - * xlevel doesn't have any feature that triggers auto-level
> - * code on old machine-types. Just check that the compat code
> - * is working correctly:
> - */
> - if (qtest_has_machine("pc-i440fx-2.4")) {
> - add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-off",
> - "SandyBridge", NULL, "pc-i440fx-2.4",
> - "xlevel", 0x80000008);
> - add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on",
> - "SandyBridge", "svm=on,npt=on", "pc-i440fx-2.4",
> - "xlevel", 0x80000008);
> - }
> -
> /* Test feature parsing */
> add_feature_test("x86/cpuid/features/plus",
> "486", "+arat",
