[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 17/53] tests: migration-test: use qtest_has_accel() API
From: |
Igor Mammedov |
Subject: |
[PATCH 17/53] tests: migration-test: use qtest_has_accel() API |
Date: |
Fri, 25 Jun 2021 05:17:42 -0400 |
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Suggested-by: Thomas Huth <thuth@redhat.com>
---
CC: dgilbert@redhat.com
CC: pbonzini@redhat.com
CC: thuth@redhat.com
CC: lvivier@redhat.com
---
tests/qtest/migration-test.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 2b028df687..eba18433bd 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1372,6 +1372,7 @@ static void test_multifd_tcp_cancel(void)
int main(int argc, char **argv)
{
char template[] = "/tmp/migration-test-XXXXXX";
+ const bool has_kvm = qtest_has_accel("kvm");
int ret;
g_test_init(&argc, &argv, NULL);
@@ -1386,8 +1387,7 @@ int main(int argc, char **argv)
* some reason)
*/
if (g_str_equal(qtest_get_arch(), "ppc64") &&
- (access("/sys/module/kvm_hv", F_OK) ||
- access("/dev/kvm", R_OK | W_OK))) {
+ (!has_kvm || access("/sys/module/kvm_hv", F_OK))) {
g_test_message("Skipping test: kvm_hv not available");
return g_test_run();
}
@@ -1396,16 +1396,9 @@ int main(int argc, char **argv)
* 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 g_test_run();
- }
-#else
- g_test_message("Skipping test: Need s390x host to work properly");
+ if (g_str_equal(qtest_get_arch(), "s390x") && !has_kvm) {
+ g_test_message("Skipping test: s390x host with KVM is required");
return g_test_run();
-#endif
}
tmpfs = mkdtemp(template);
--
2.27.0
- [PATCH 09/53] tests: acpi: whitelist expected blobs for new acpi/q35/ivrs testcase, (continued)
- [PATCH 09/53] tests: acpi: whitelist expected blobs for new acpi/q35/ivrs testcase, Igor Mammedov, 2021/06/25
- [PATCH 10/53] tests: acpi: add testcase for amd-iommu (IVRS table), Igor Mammedov, 2021/06/25
- [PATCH 15/53] tests: acpi: add expected IORT table blob, Igor Mammedov, 2021/06/25
- [PATCH 11/53] tests: acpi: update expected blobs, Igor Mammedov, 2021/06/25
- [PATCH 16/53] tests: arm-cpu-features: use qtest_has_kvm() API, Igor Mammedov, 2021/06/25
- [PATCH 12/53] tests: acpi: arm/virt: drop redudant test_acpi_one() in test_acpi_virt_tcg(), Igor Mammedov, 2021/06/25
- [PATCH 13/53] tests: acpi: whitelist expected tables for acpi/virt/iort testcase, Igor Mammedov, 2021/06/25
- [PATCH 14/53] tests: acpi: arm/virt: use kvm to test IORT table, Igor Mammedov, 2021/06/25
- [PATCH 12/53] tests: acpi: arm/virt: drop redundant test_acpi_one() in test_acpi_virt_tcg(), Igor Mammedov, 2021/06/25
- [PATCH 18/53] tests: bios-tables-test: use qtest_has_accel() API to register TCG only tests, Igor Mammedov, 2021/06/25
- [PATCH 17/53] tests: migration-test: use qtest_has_accel() API,
Igor Mammedov <=
- [PATCH 19/53] acpi: add helper routines to initialize ACPI tables, Igor Mammedov, 2021/06/25
- [PATCH 20/53] acpi: build_rsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 22/53] acpi: build_slit: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 23/53] acpi: build_fadt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 21/53] acpi: build_xsdt: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 26/53] acpi: build_mcfg: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 25/53] acpi: acpi_build_hest: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25
- [PATCH 24/53] acpi: build_tpm2: use acpi_init_table()/acpi_table_composed() instead of build_header(), Igor Mammedov, 2021/06/25