[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 09/10] qtest/migration-test: Skip tests if KVM not builtin on
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 09/10] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 |
Date: |
Sun, 2 May 2021 00:36:37 +0200 |
We might have a s390x/ppc64 QEMU binary built without the KVM
accelerator (configured with --disable-kvm).
Checking for /dev/kvm accessibility isn't enough, also check for the
accelerator in the binary.
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/qtest/migration-test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 3a711bb4929..c32a2aa30a2 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1408,7 +1408,7 @@ int main(int argc, char **argv)
*/
if (g_str_equal(qtest_get_arch(), "ppc64") &&
(access("/sys/module/kvm_hv", F_OK) ||
- access("/dev/kvm", R_OK | W_OK))) {
+ access("/dev/kvm", R_OK | W_OK) || !qtest_has_accel("kvm"))) {
g_test_message("Skipping test: kvm_hv not available");
return g_test_run();
}
@@ -1419,7 +1419,7 @@ int main(int argc, char **argv)
*/
if (g_str_equal(qtest_get_arch(), "s390x")) {
#if defined(HOST_S390X)
- if (access("/dev/kvm", R_OK | W_OK)) {
+ if (access("/dev/kvm", R_OK | W_OK) || !qtest_has_accel("kvm")) {
g_test_message("Skipping test: kvm not available");
return g_test_run();
}
--
2.26.3
- [PATCH v5 03/10] tests/qtest: Add qtest_has_accel() method, (continued)
- [PATCH v5 03/10] tests/qtest: Add qtest_has_accel() method, Philippe Mathieu-Daudé, 2021/05/01
- [PATCH v5 04/10] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for KVM, Philippe Mathieu-Daudé, 2021/05/01
- [PATCH v5 05/10] qtest/arm-cpu-features: Restrict sve_tests_sve_off_kvm test to KVM, Philippe Mathieu-Daudé, 2021/05/01
- [PATCH v5 06/10] qtest/arm-cpu-features: Remove TCG fallback to KVM specific tests, Philippe Mathieu-Daudé, 2021/05/01
- [PATCH v5 07/10] qtest/arm-cpu-features: Use generic qtest_has_accel() to check for TCG, Philippe Mathieu-Daudé, 2021/05/01
- [PATCH v5 08/10] qtest/bios-tables-test: Make test build-independent from accelerator, Philippe Mathieu-Daudé, 2021/05/01
[PATCH v5 09/10] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64,
Philippe Mathieu-Daudé <=
[PATCH v5 10/10] qtest: Do not restrict bios-tables-test to Aarch64 hosts anymore, Philippe Mathieu-Daudé, 2021/05/01