[v2] hw/i386/pc: Remove deprecated 2.8 and 2.9 PC machines

[PATCH v2 16/16] tests/qtest/test-x86-cpuid-compat: Remove the test with the i440fx-2.9 machine

Posted by Thomas Huth 1 month, 2 weeks ago

From: Thomas Huth <thuth@redhat.com>

The machine has been removed, so the related test can now be removed, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/test-x86-cpuid-compat.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
index 5e0547e81b7..c534e764f82 100644
--- a/tests/qtest/test-x86-cpuid-compat.c
+++ b/tests/qtest/test-x86-cpuid-compat.c
@@ -343,17 +343,6 @@ int main(int argc, char **argv)
                    "486", "xlevel2=0xC0000002,xstore=on",
                    NULL, "xlevel2", 0xC0000002);
 
-    /* Check compatibility of old machine-types that didn't
-     * auto-increase level/xlevel/xlevel2: */
-    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",
-                       "level", 10);
-        add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on",
-                       "Conroe", "erms=on", "pc-i440fx-2.9",
-                       "level", 10);
-    }
-
     /* Test feature parsing */
     add_feature_test("x86/cpuid/features/plus",
                      "486", "+arat",
-- 
2.53.0

Re: [PATCH v2 16/16] tests/qtest/test-x86-cpuid-compat: Remove the test with the i440fx-2.9 machine

Posted by Igor Mammedov 1 month, 1 week ago

On Wed, 25 Feb 2026 10:20:24 +0100
Thomas Huth <thuth@redhat.com> wrote:

> From: Thomas Huth <thuth@redhat.com>
> 
> The machine has been removed, so the related test can now be removed, too.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  tests/qtest/test-x86-cpuid-compat.c | 11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
> index 5e0547e81b7..c534e764f82 100644
> --- a/tests/qtest/test-x86-cpuid-compat.c
> +++ b/tests/qtest/test-x86-cpuid-compat.c
> @@ -343,17 +343,6 @@ int main(int argc, char **argv)
>                     "486", "xlevel2=0xC0000002,xstore=on",
>                     NULL, "xlevel2", 0xC0000002);
>  
> -    /* Check compatibility of old machine-types that didn't
> -     * auto-increase level/xlevel/xlevel2: */
> -    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",
> -                       "level", 10);
> -        add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on",
> -                       "Conroe", "erms=on", "pc-i440fx-2.9",
> -                       "level", 10);
> -    }
> -
>      /* Test feature parsing */
>      add_feature_test("x86/cpuid/features/plus",
>                       "486", "+arat",

Re: [PATCH v2 16/16] tests/qtest/test-x86-cpuid-compat: Remove the test with the i440fx-2.9 machine

Posted by Fabiano Rosas 1 month, 2 weeks ago

Thomas Huth <thuth@redhat.com> writes:

> From: Thomas Huth <thuth@redhat.com>
>
> The machine has been removed, so the related test can now be removed, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qtest/test-x86-cpuid-compat.c | 11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
> index 5e0547e81b7..c534e764f82 100644
> --- a/tests/qtest/test-x86-cpuid-compat.c
> +++ b/tests/qtest/test-x86-cpuid-compat.c
> @@ -343,17 +343,6 @@ int main(int argc, char **argv)
>                     "486", "xlevel2=0xC0000002,xstore=on",
>                     NULL, "xlevel2", 0xC0000002);
>  
> -    /* Check compatibility of old machine-types that didn't
> -     * auto-increase level/xlevel/xlevel2: */
> -    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",
> -                       "level", 10);
> -        add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on",
> -                       "Conroe", "erms=on", "pc-i440fx-2.9",
> -                       "level", 10);
> -    }
> -
>      /* Test feature parsing */
>      add_feature_test("x86/cpuid/features/plus",
>                       "486", "+arat",

Reviewed-by: Fabiano Rosas <farosas@suse.de>