tests/qtest/migration: Add a check for the availability of the "pc" machine

[PATCH] tests/qtest/migration: Add a check for the availability of the "pc" machine

Posted by Thomas Huth 1 year, 5 months ago

The test_vcpu_dirty_limit is the only test that does not check for the
availability of the machine before starting the test, so it fails when
QEMU has been configured with --without-default-devices. Add a check for
the "pc" machine type to fix it.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qtest/migration-test.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 6c06100d91..8fee18dfbe 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -4026,8 +4026,10 @@ int main(int argc, char **argv)
     if (g_str_equal(arch, "x86_64") && has_kvm && kvm_dirty_ring_supported()) {
         migration_test_add("/migration/dirty_ring",
                            test_precopy_unix_dirty_ring);
-        migration_test_add("/migration/vcpu_dirty_limit",
-                           test_vcpu_dirty_limit);
+        if (qtest_has_machine("pc")) {
+            migration_test_add("/migration/vcpu_dirty_limit",
+                               test_vcpu_dirty_limit);
+        }
     }
 
     ret = g_test_run();
-- 
2.46.0

Re: [PATCH] tests/qtest/migration: Add a check for the availability of the "pc" machine

Posted by Fabiano Rosas 1 year, 5 months ago

Thomas Huth <thuth@redhat.com> writes:

> The test_vcpu_dirty_limit is the only test that does not check for the
> availability of the machine before starting the test, so it fails when
> QEMU has been configured with --without-default-devices. Add a check for
> the "pc" machine type to fix it.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qtest/migration-test.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index 6c06100d91..8fee18dfbe 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -4026,8 +4026,10 @@ int main(int argc, char **argv)
>      if (g_str_equal(arch, "x86_64") && has_kvm && kvm_dirty_ring_supported()) {
>          migration_test_add("/migration/dirty_ring",
>                             test_precopy_unix_dirty_ring);
> -        migration_test_add("/migration/vcpu_dirty_limit",
> -                           test_vcpu_dirty_limit);
> +        if (qtest_has_machine("pc")) {
> +            migration_test_add("/migration/vcpu_dirty_limit",
> +                               test_vcpu_dirty_limit);
> +        }
>      }
>  
>      ret = g_test_run();

Reviewed-by: Fabiano Rosas <farosas@suse.de>