tests: migration-test: use qtest_has_accel() API
Signed-off-by: Igor Mammedov <imammedo@redhat.com> Suggested-by: Thomas Huth <thuth@redhat.com> Message-Id: <20210902113551.461632-15-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
07e6ed2c79
commit
b72c76033d
|
@ -1420,6 +1420,7 @@ static bool kvm_dirty_ring_supported(void)
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
char template[] = "/tmp/migration-test-XXXXXX";
|
char template[] = "/tmp/migration-test-XXXXXX";
|
||||||
|
const bool has_kvm = qtest_has_accel("kvm");
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
|
@ -1434,8 +1435,7 @@ int main(int argc, char **argv)
|
||||||
* some reason)
|
* some reason)
|
||||||
*/
|
*/
|
||||||
if (g_str_equal(qtest_get_arch(), "ppc64") &&
|
if (g_str_equal(qtest_get_arch(), "ppc64") &&
|
||||||
(access("/sys/module/kvm_hv", F_OK) ||
|
(!has_kvm || access("/sys/module/kvm_hv", F_OK))) {
|
||||||
access("/dev/kvm", R_OK | W_OK))) {
|
|
||||||
g_test_message("Skipping test: kvm_hv not available");
|
g_test_message("Skipping test: kvm_hv not available");
|
||||||
return g_test_run();
|
return g_test_run();
|
||||||
}
|
}
|
||||||
|
@ -1444,17 +1444,10 @@ int main(int argc, char **argv)
|
||||||
* Similar to ppc64, s390x seems to be touchy with TCG, so disable it
|
* Similar to ppc64, s390x seems to be touchy with TCG, so disable it
|
||||||
* there until the problems are resolved
|
* there until the problems are resolved
|
||||||
*/
|
*/
|
||||||
if (g_str_equal(qtest_get_arch(), "s390x")) {
|
if (g_str_equal(qtest_get_arch(), "s390x") && !has_kvm) {
|
||||||
#if defined(HOST_S390X)
|
g_test_message("Skipping test: s390x host with KVM is required");
|
||||||
if (access("/dev/kvm", R_OK | W_OK)) {
|
|
||||||
g_test_message("Skipping test: kvm not available");
|
|
||||||
return g_test_run();
|
return g_test_run();
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
g_test_message("Skipping test: Need s390x host to work properly");
|
|
||||||
return g_test_run();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
tmpfs = mkdtemp(template);
|
tmpfs = mkdtemp(template);
|
||||||
if (!tmpfs) {
|
if (!tmpfs) {
|
||||||
|
|
Loading…
Reference in New Issue