[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 09/12] qtest/migration-test: Skip tests if KVM not builtin
From: |
Alex Bennée |
Subject: |
Re: [PATCH v4 09/12] qtest/migration-test: Skip tests if KVM not builtin on s390x/ppc64 |
Date: |
Fri, 30 Apr 2021 16:37:56 +0100 |
User-agent: |
mu4e 1.5.12; emacs 28.0.50 |
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 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é <philmd@redhat.com>
> ---
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Cc: Greg Kurz <groug@kaod.org>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: qemu-ppc@nongnu.org
> Cc: qemu-s390x@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();
> }
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
--
Alex Bennée