tests: qemuxml2argv: Make use of versioned cpu-tsc-frequency and cpu-host-model-cmt...

Commit fb973cfbb4de added versioned test outputs for the above mentioned
tests but didn't actually enable them. Fix that mistake and fix the
output of the tsc-frequency test.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
index a3b6e4e57e6b0b37461caa03fbf72be982b59696..b0e6d05b6cc2b41da1fa68a1a70e1077d2c945b8 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
@@ -14,8 +14,8 @@ QEMU_AUDIO_DRV=none \
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.0,accel=kvm,usb=off,dump-guest-core=off \
 -cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc_adjust=on,\
-clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on,\
-invtsc=on,tsc-frequency=3504000000 \
+clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,invtsc=on,\
+tsc-frequency=3504000000 \
 -m 214 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b7cb356d1339e836ca9829eb8d5a6ea50c585251..db79301f0e7e0e9268dc1748f3de977d7f4ccd54 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1767,7 +1767,9 @@ mymain(void)
     DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM);
     DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM);
     DO_TEST("cpu-host-model-cmt", NONE);
+    DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
     DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM);
+    DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0");
     DO_TEST_CAPS_VER("cpu-translation", "4.0.0");
     DO_TEST_CAPS_LATEST("cpu-translation");
     qemuTestSetHostCPU(driver.caps, NULL);