[PATCH 3/3] tests/qtest/test-x86-cpuid-compat: Replaced the removed pc-i440fx-2.* machines

[Thomas Huth <thuth@redhat.com>]

Since the pc-i440fx-2.* machine types have been removed, let's run
the tests with the corresponding q35 machine types instead (until
those get removed, too, then we have to remove the tests completely).

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

diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
index 9cbc8b7ae9..f77e481279 100644
--- a/tests/qtest/test-x86-cpuid-compat.c
+++ b/tests/qtest/test-x86-cpuid-compat.c
@@ -346,23 +346,23 @@ 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",
+    if (qtest_has_machine("pc-q35-2.7")) {
+        add_cpuid_test("x86/cpuid/auto-level/pc-q35-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",
+                       "pc-q35-2.7", "level", 1);
+        add_cpuid_test("x86/cpuid/auto-xlevel/pc-q35-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",
+                       "pc-q35-2.7", "xlevel", 0);
+        add_cpuid_test("x86/cpuid/auto-xlevel2/pc-q35-2.7",
+                       "486", "xstore=on", "pc-q35-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",
+    if (qtest_has_machine("pc-q35-2.9")) {
+        add_cpuid_test("x86/cpuid/auto-level7/pc-q35-2.9/off",
+                       "Conroe", NULL, "pc-q35-2.9",
                        "level", 10);
-        add_cpuid_test("x86/cpuid/auto-level7/pc-i440fx-2.9/on",
-                       "Conroe", "erms=on", "pc-i440fx-2.9",
+        add_cpuid_test("x86/cpuid/auto-level7/pc-q35-2.9/on",
+                       "Conroe", "erms=on", "pc-q35-2.9",
                        "level", 10);
     }
 
@@ -371,12 +371,12 @@ int main(int argc, char **argv)
      * 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",
+    if (qtest_has_machine("pc-q35-2.4")) {
+        add_cpuid_test("x86/cpuid/xlevel-compat/pc-q35-2.4/npt-off",
+                       "SandyBridge", NULL, "pc-q35-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",
+        add_cpuid_test("x86/cpuid/xlevel-compat/pc-q35-2.4/npt-on",
+                       "SandyBridge", "svm=on,npt=on", "pc-q35-2.4",
                        "xlevel", 0x80000008);
     }
 
-- 
2.47.1