qemuxml2argvtest: Modernize 'cpu-exact' cases

Use real capabilities, but select the fake 'Haswell' host CPU for test
stability.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-exact1.args
rename to tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args

diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-exact2-nofallback.args
rename to tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args

diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-exact2.args
rename to tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args

diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-no-removed-features.args
rename to tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6997d7400cf8871a388110bbb7be9dfb753c9739..cea936518e7b834480d9fad06c3576c59d0b7712 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1739,11 +1739,11 @@ mymain(void)
 
     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
-    DO_TEST("cpu-exact1", QEMU_CAPS_KVM);
-    DO_TEST("cpu-exact2", QEMU_CAPS_KVM);
-    DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
+    DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact2", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
+    DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact2-nofallback", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
     DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-strict1", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
-    DO_TEST("cpu-no-removed-features", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-no-removed-features", "x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
 
     /* EPYC-Milan became available in qemu-6.0, use it for the fallback tests */
     DO_TEST_CAPS_VER_FAILURE("cpu-nofallback", "5.2.0");