On Thu, 15 Apr 2021 18:33:01 +0200 Philippe Mathieu-Daudé <[email protected]> wrote:
> 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. > > Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > --- LGTM Reviewed-by: Greg Kurz <[email protected]> > Cc: David Gibson <[email protected]> > Cc: Greg Kurz <[email protected]> > Cc: Halil Pasic <[email protected]> > Cc: Cornelia Huck <[email protected]> > Cc: Christian Borntraeger <[email protected]> > Cc: [email protected] > Cc: [email protected] > --- > 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(); > }
