From: Thomas Huth <thuth@redhat.com>
Date: Fri, 19 Oct 2018 10:54:47 +0000 (+0200)
Subject: tests/migration-test: Disable s390x test when running with TCG
X-Git-Tag: v3.1.0-rc0~37^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d254b392cb1006039e3f1ede3375181b878091c5;p=thirdparty%2Fqemu.git

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.

Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/tests/migration-test.c b/tests/migration-test.c
index b7920255c5d..06ca5068d89 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -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));