From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 22 Jun 2022 11:30:18 +0000 (+0200)
Subject: qemuxml2argvtest: Move real-caps versions of cpu-host tests out of the block setting... 
X-Git-Tag: v8.6.0-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed150afb4e579043a1455d2be155b5334f93da3c;p=thirdparty%2Flibvirt.git

qemuxml2argvtest: Move real-caps versions of cpu-host tests out of the block setting fake host cpu

Make it obvious that the fake cpu does not apply to the test cases based
on real capabilities.

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

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e14ed8b882..74a1baa018 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2120,12 +2120,13 @@ mymain(void)
     DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM);
     DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM);
     DO_TEST_NOCAPS("cpu-host-model-cmt");
-    DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
     DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM);
+    qemuTestSetHostCPU(&driver, driver.hostarch, NULL);
+
+    DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
     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, driver.hostarch, NULL);
 
     DO_TEST_NOCAPS("memtune");
     DO_TEST_NOCAPS("memtune-unlimited");