On Thu, Apr 15, 2021 at 06:33:01PM +0200, Philippe Mathieu-Daudé 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é <phi...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> Cc: David Gibson <da...@gibson.dropbear.id.au>
> Cc: Greg Kurz <gr...@kaod.org>
> Cc: Halil Pasic <pa...@linux.ibm.com>
> Cc: Cornelia Huck <coh...@redhat.com>
> Cc: Christian Borntraeger <borntrae...@de.ibm.com>
> Cc: qemu-...@nongnu.org
> Cc: qemu-s3...@nongnu.org
> ---
> 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();
> }
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
