Skip to contentSkip to conversation

tests/migration-test: Disable s390x test when running with TCG

PATCH In review Thomas Huth 3 participants 3 messages Oct 19, 2018

lore
Share & tools
lore

Thomas Huth

author
#0 lore raw

PATCH 1/1 tests/migration-test: Disable s390x test when running with TCG

The migration test for s390x sometimes hangs when running with TCG, similar to the problems that we have already observed with TCG for the ppc64 guests. Thus disable the s390x test when we are not running with KVM for now until the problem with TCG has been resolved.

Signed-off-by Thomas Huth <[email protected]>
---
 tests/migration-test.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
tests/migration-test.c +16 -0
index b792025..06ca506 100644
@@ -803,6 +803,22 @@ int main(int argc, char **argv)
         return 0;
     }
 
+    /*
+     * Similar to ppc64, s390x seems to be touchy with TCG, so disable it
+     * there until the problems are resolved
+     */
+    if (g_str_equal(qtest_get_arch(), "s390x")) {
+#if defined(HOST_S390X)
+        if (access("/dev/kvm", R_OK | W_OK)) {
+            g_test_message("Skipping test: kvm not available");
+            return 0;
+        }
+#else
+        g_test_message("Skipping test: Need s390x host to work properly");
+        return 0;
+#endif
+    }
+
     tmpfs = mkdtemp(template);
     if (!tmpfs) {
         g_test_message("mkdtemp on path (%s): %s\n", template, strerror(errno));
Signature · 1 line
1.8.3.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 28 lines · Thomas Huth

The migration test for s390x sometimes hangs when running with TCG, similar to the problems that we have already observed with TCG for the ppc64 guests. Thus disable the s390x test when we are not running with KVM for now until the problem with TCG has been resolved.

Signed-off-by Thomas Huth <[email protected]>
---
 tests/migration-test.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
tests/migration-test.c +9 -0
index b792025..06ca506 100644
@@ -803,6 +803,22 @@ int main(int argc, char **argv)
         return 0;
     }
 
+    /*
+     * Similar to ppc64, s390x seems to be touchy with TCG, so disable it
+     * there until the problems are resolved
+     */
+    if (g_str_equal(qtest_get_arch(), "s390x")) {
+#if defined(HOST_S390X)
+        if (access("/dev/kvm", R_OK | W_OK)) {
+            g_test_message("Skipping test: kvm not available");
+            return 0;

tests/migration-test.c int main(int argc, char **argv) · line 824

Quoted 10 lines
tests/migration-test.c +7 -0
+        }
+#else
+        g_test_message("Skipping test: Need s390x host to work properly");
+        return 0;
+#endif
+    }
+
     tmpfs = mkdtemp(template);
     if (!tmpfs) {
         g_test_message("mkdtemp on path (%s): %s\n", template, strerror(errno));
Reviewed-by Laurent Vivier <[email protected]>
Reviewed-by
#2 lore raw
Quoted 7 lines · Laurent Vivier
Quoted 6 lines · Thomas Huth

The migration test for s390x sometimes hangs when running with TCG, similar to the problems that we have already observed with TCG for the ppc64 guests. Thus disable the s390x test when we are not running with KVM for now until the problem with TCG has been resolved.

Signed-off-by Thomas Huth <[email protected]>
Reviewed-by Emilio G. Cota <[email protected]>

Thanks!

		E.