50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From 5c84a2c439afb2a6a5aa69ccd2d7e2ecdb1d18cf Mon Sep 17 00:00:00 2001
|
|
Message-Id: <5c84a2c439afb2a6a5aa69ccd2d7e2ecdb1d18cf.1574270987.git.crobinso@redhat.com>
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Wed, 20 Nov 2019 18:09:55 +0100
|
|
Subject: [PATCH] pseries: disable migration-test if /dev/kvm cannot be used
|
|
|
|
On ppc64, migration-test only works with kvm_hv, and we already
|
|
have a check to verify the module is loaded.
|
|
|
|
kvm_hv module can be loaded in memory and /sys/module/kvm_hv exists,
|
|
but on some systems (like build systems) /dev/kvm can be missing
|
|
(by administrators choice).
|
|
|
|
And as kvm_hv exists test-migration is started but QEMU falls back to
|
|
TCG because it cannot be used:
|
|
|
|
Could not access KVM kernel module: No such file or directory
|
|
failed to initialize KVM: No such file or directory
|
|
Back to tcg accelerator
|
|
|
|
And as the test is done with TCG, it fails.
|
|
|
|
As for s390x, we must check for the existence and the access rights
|
|
of /dev/kvm.
|
|
|
|
Reported-by: Cole Robinson <crobinso@redhat.com>
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
---
|
|
tests/migration-test.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/migration-test.c b/tests/migration-test.c
|
|
index ac780dffda..2b25ba6d77 100644
|
|
--- a/tests/migration-test.c
|
|
+++ b/tests/migration-test.c
|
|
@@ -1349,7 +1349,8 @@ int main(int argc, char **argv)
|
|
* some reason)
|
|
*/
|
|
if (g_str_equal(qtest_get_arch(), "ppc64") &&
|
|
- access("/sys/module/kvm_hv", F_OK)) {
|
|
+ (access("/sys/module/kvm_hv", F_OK) ||
|
|
+ access("/dev/kvm", R_OK | W_OK))) {
|
|
g_test_message("Skipping test: kvm_hv not available");
|
|
return g_test_run();
|
|
}
|
|
--
|
|
2.23.0
|
|
|