tests/qtest/migration: Fix compile errors when CONFIG_UADK is set

[PATCH] tests/qtest/migration: Fix compile errors when CONFIG_UADK is set

Posted by Shameer Kolothum via 1 year, 1 month ago

Removes accidental inclusion of unrelated functions within CONFIG_UADK
as this causes compile errors like:

error: redefinition of ‘migrate_hook_start_xbzrle’

Fixes: 932f74f3fe6e ("tests/qtest/migration: Split compression tests from migration-test.c")
Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
---
 tests/qtest/migration/compression-tests.c | 54 -----------------------
 1 file changed, 54 deletions(-)

diff --git a/tests/qtest/migration/compression-tests.c b/tests/qtest/migration/compression-tests.c
index 6de87bc47d..d78f1f11f1 100644
--- a/tests/qtest/migration/compression-tests.c
+++ b/tests/qtest/migration/compression-tests.c
@@ -88,59 +88,6 @@ migrate_hook_start_precopy_tcp_multifd_uadk(QTestState *from,
     return migrate_hook_start_precopy_tcp_multifd_common(from, to, "uadk");
 }
 
-static void *
-migrate_hook_start_xbzrle(QTestState *from,
-                          QTestState *to)
-{
-    migrate_set_parameter_int(from, "xbzrle-cache-size", 33554432);
-
-    migrate_set_capability(from, "xbzrle", true);
-    migrate_set_capability(to, "xbzrle", true);
-
-    return NULL;
-}
-
-static void test_precopy_unix_xbzrle(void)
-{
-    g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
-    MigrateCommon args = {
-        .connect_uri = uri,
-        .listen_uri = uri,
-        .start_hook = migrate_hook_start_xbzrle,
-        .iterations = 2,
-        /*
-         * XBZRLE needs pages to be modified when doing the 2nd+ round
-         * iteration to have real data pushed to the stream.
-         */
-        .live = true,
-    };
-
-    test_precopy_common(&args);
-}
-
-static void *
-migrate_hook_start_precopy_tcp_multifd_zlib(QTestState *from,
-                                            QTestState *to)
-{
-    /*
-     * Overloading this test to also check that set_parameter does not error.
-     * This is also done in the tests for the other compression methods.
-     */
-    migrate_set_parameter_int(from, "multifd-zlib-level", 2);
-    migrate_set_parameter_int(to, "multifd-zlib-level", 2);
-
-    return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zlib");
-}
-
-static void test_multifd_tcp_zlib(void)
-{
-    MigrateCommon args = {
-        .listen_uri = "defer",
-        .start_hook = migrate_hook_start_precopy_tcp_multifd_zlib,
-    };
-    test_precopy_common(&args);
-}
-
 static void test_multifd_tcp_uadk(void)
 {
     MigrateCommon args = {
@@ -151,7 +98,6 @@ static void test_multifd_tcp_uadk(void)
 }
 #endif /* CONFIG_UADK */
 
-
 static void *
 migrate_hook_start_xbzrle(QTestState *from,
                           QTestState *to)
-- 
2.34.1

Re: [PATCH] tests/qtest/migration: Fix compile errors when CONFIG_UADK is set

Posted by Fabiano Rosas 1 year, 1 month ago

Shameer Kolothum via <qemu-devel@nongnu.org> writes:

> Removes accidental inclusion of unrelated functions within CONFIG_UADK
> as this causes compile errors like:
>
> error: redefinition of ‘migrate_hook_start_xbzrle’
>
> Fixes: 932f74f3fe6e ("tests/qtest/migration: Split compression tests from migration-test.c")
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
> ---
>  tests/qtest/migration/compression-tests.c | 54 -----------------------
>  1 file changed, 54 deletions(-)
>
> diff --git a/tests/qtest/migration/compression-tests.c b/tests/qtest/migration/compression-tests.c
> index 6de87bc47d..d78f1f11f1 100644
> --- a/tests/qtest/migration/compression-tests.c
> +++ b/tests/qtest/migration/compression-tests.c
> @@ -88,59 +88,6 @@ migrate_hook_start_precopy_tcp_multifd_uadk(QTestState *from,
>      return migrate_hook_start_precopy_tcp_multifd_common(from, to, "uadk");
>  }
>  
> -static void *
> -migrate_hook_start_xbzrle(QTestState *from,
> -                          QTestState *to)
> -{
> -    migrate_set_parameter_int(from, "xbzrle-cache-size", 33554432);
> -
> -    migrate_set_capability(from, "xbzrle", true);
> -    migrate_set_capability(to, "xbzrle", true);
> -
> -    return NULL;
> -}
> -
> -static void test_precopy_unix_xbzrle(void)
> -{
> -    g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
> -    MigrateCommon args = {
> -        .connect_uri = uri,
> -        .listen_uri = uri,
> -        .start_hook = migrate_hook_start_xbzrle,
> -        .iterations = 2,
> -        /*
> -         * XBZRLE needs pages to be modified when doing the 2nd+ round
> -         * iteration to have real data pushed to the stream.
> -         */
> -        .live = true,
> -    };
> -
> -    test_precopy_common(&args);
> -}
> -
> -static void *
> -migrate_hook_start_precopy_tcp_multifd_zlib(QTestState *from,
> -                                            QTestState *to)
> -{
> -    /*
> -     * Overloading this test to also check that set_parameter does not error.
> -     * This is also done in the tests for the other compression methods.
> -     */
> -    migrate_set_parameter_int(from, "multifd-zlib-level", 2);
> -    migrate_set_parameter_int(to, "multifd-zlib-level", 2);
> -
> -    return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zlib");
> -}
> -
> -static void test_multifd_tcp_zlib(void)
> -{
> -    MigrateCommon args = {
> -        .listen_uri = "defer",
> -        .start_hook = migrate_hook_start_precopy_tcp_multifd_zlib,
> -    };
> -    test_precopy_common(&args);
> -}
> -
>  static void test_multifd_tcp_uadk(void)
>  {
>      MigrateCommon args = {
> @@ -151,7 +98,6 @@ static void test_multifd_tcp_uadk(void)
>  }
>  #endif /* CONFIG_UADK */
>  
> -
>  static void *
>  migrate_hook_start_xbzrle(QTestState *from,
>                            QTestState *to)

Queued, thanks!

Re: [PATCH] tests/qtest/migration: Fix compile errors when CONFIG_UADK is set

Posted by Peter Xu 1 year, 1 month ago

On Tue, Dec 17, 2024 at 01:10:46PM +0000, Shameer Kolothum wrote:
> Removes accidental inclusion of unrelated functions within CONFIG_UADK
> as this causes compile errors like:
> 
> error: redefinition of ‘migrate_hook_start_xbzrle’
> 
> Fixes: 932f74f3fe6e ("tests/qtest/migration: Split compression tests from migration-test.c")
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

-- 
Peter Xu

Re: [PATCH] tests/qtest/migration: Fix compile errors when CONFIG_UADK is set

Posted by Fabiano Rosas 1 year, 1 month ago

Shameer Kolothum via <qemu-devel@nongnu.org> writes:

> Removes accidental inclusion of unrelated functions within CONFIG_UADK
> as this causes compile errors like:
>
> error: redefinition of ‘migrate_hook_start_xbzrle’
>
> Fixes: 932f74f3fe6e ("tests/qtest/migration: Split compression tests from migration-test.c")
> Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>

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