@samitouri / QOSamiQemu / commits / 167eb33cad

tests/qtest/migration: Set compression method in compression-tests

Stop calling a common function to set the multifd compression method. The default method is "none", so the common function is not necessary for tests that don't set compression and will be removed. Signed-off-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com> Link: https://lore.kernel.org/r/20260505160915.25558-9-farosas@suse.de Signed-off-by: Peter Xu <peterx@redhat.com>

Fabiano Rosas committed May 5, 2026 at 13:09 UTC 167eb33cad8fc551a2d8b2ba59226c426111d8ea
1 file changed +17 -5
tests/qtest/migration/compression-tests.c
+17 -5
@@ -20,6 +20,13 @@
20
21 static char *tmpfs;
22
23 +static void set_multifd_compression(QTestState *from, QTestState *to,
24 + const char *method)
25 +{
26 + migrate_set_parameter_str(from, "multifd-compression", method);
27 + migrate_set_parameter_str(to, "multifd-compression", method);
28 +}
29 +
30 #ifdef CONFIG_ZSTD
31 static void *
32 migrate_hook_start_precopy_tcp_multifd_zstd(QTestState *from,
@@ -27,8 +34,9 @@ migrate_hook_start_precopy_tcp_multifd_zstd(QTestState *from,
34 {
35 migrate_set_parameter_int(from, "multifd-zstd-level", 2);
36 migrate_set_parameter_int(to, "multifd-zstd-level", 2);
37 + set_multifd_compression(from, to, "zstd");
38
31 - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zstd");
39 + return NULL;
40 }
41
42 static void test_multifd_tcp_zstd(char *name, MigrateCommon *args)
@@ -58,8 +66,9 @@ migrate_hook_start_precopy_tcp_multifd_qatzip(QTestState *from,
66 {
67 migrate_set_parameter_int(from, "multifd-qatzip-level", 2);
68 migrate_set_parameter_int(to, "multifd-qatzip-level", 2);
69 + set_multifd_compression(from, to, "qatzip");
70
62 - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "qatzip");
71 + return NULL;
72 }
73
74 static void test_multifd_tcp_qatzip(char *name, MigrateCommon *args)
@@ -77,7 +86,8 @@ static void *
86 migrate_hook_start_precopy_tcp_multifd_qpl(QTestState *from,
87 QTestState *to)
88 {
80 - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "qpl");
89 + set_multifd_compression(from, to, "qpl");
90 + return NULL;
91 }
92
93 static void test_multifd_tcp_qpl(char *name, MigrateCommon *args)
@@ -95,7 +105,8 @@ static void *
105 migrate_hook_start_precopy_tcp_multifd_uadk(QTestState *from,
106 QTestState *to)
107 {
98 - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "uadk");
108 + set_multifd_compression(from, to, "uadk");
109 + return NULL;
110 }
111
112 static void test_multifd_tcp_uadk(char *name, MigrateCommon *args)
@@ -141,8 +152,9 @@ migrate_hook_start_precopy_tcp_multifd_zlib(QTestState *from,
152 */
153 migrate_set_parameter_int(from, "multifd-zlib-level", 2);
154 migrate_set_parameter_int(to, "multifd-zlib-level", 2);
155 + set_multifd_compression(from, to, "zlib");
156
145 - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zlib");
157 + return NULL;
158 }
159
160 static void test_multifd_tcp_zlib(char *name, MigrateCommon *args)