@samitouri / QOSamiQemu / commits / 450824b4fb

tests/qtest/migration: Make file-tests defer by default

All file: tests use listen_uri="defer". Make this the default in the common function. Signed-off-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com> Link: https://lore.kernel.org/r/20260505160915.25558-3-farosas@suse.de Signed-off-by: Peter Xu <peterx@redhat.com>

Fabiano Rosas committed May 5, 2026 at 13:09 UTC 450824b4fb18909124a0adbde6c132d0e5209c6c
3 files changed +1 -16
tests/qtest/migration/cpr-tests.c
-1
@@ -36,7 +36,6 @@ static void test_mode_reboot(char *name, MigrateCommon *args)
36 FILE_TEST_FILENAME);
37
38 args->connect_uri = uri;
39 - args->listen_uri = "defer";
39 args->start_hook = migrate_hook_start_mode_reboot;
40
41 args->start.mem_type = MEM_TYPE_SHMEM;
tests/qtest/migration/file-tests.c
-14
@@ -70,8 +70,6 @@ static void test_precopy_file(char *name, MigrateCommon *args)
70 g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
71 FILE_TEST_FILENAME);
72 args->connect_uri = uri;
73 - args->listen_uri = "defer";
74 -
73 test_file_common(args, true);
74 }
75
@@ -114,7 +112,6 @@ static void test_precopy_file_offset_fdset(char *name, MigrateCommon *args)
112 g_autofree char *uri = g_strdup_printf("file:/dev/fdset/1,offset=%d",
113 FILE_TEST_OFFSET);
114 args->connect_uri = uri;
117 - args->listen_uri = "defer";
115 args->start_hook = migrate_hook_start_file_offset_fdset;
116
117 test_file_common(args, false);
@@ -128,8 +125,6 @@ static void test_precopy_file_offset(char *name, MigrateCommon *args)
125 FILE_TEST_OFFSET);
126
127 args->connect_uri = uri;
131 - args->listen_uri = "defer";
132 -
128 test_file_common(args, false);
129 }
130
@@ -140,7 +135,6 @@ static void test_precopy_file_offset_bad(char *name, MigrateCommon *args)
135 tmpfs, FILE_TEST_FILENAME);
136
137 args->connect_uri = uri;
143 - args->listen_uri = "defer";
138 args->result = MIG_TEST_QMP_ERROR;
139
140 test_file_common(args, false);
@@ -152,7 +146,6 @@ static void test_precopy_file_mapped_ram_live(char *name, MigrateCommon *args)
146 FILE_TEST_FILENAME);
147
148 args->connect_uri = uri;
155 - args->listen_uri = "defer";
149
150 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
151
@@ -165,7 +158,6 @@ static void test_precopy_file_mapped_ram(char *name, MigrateCommon *args)
158 FILE_TEST_FILENAME);
159
160 args->connect_uri = uri;
168 - args->listen_uri = "defer";
161
162 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
163
@@ -177,7 +169,6 @@ static void test_multifd_file_mapped_ram_live(char *name, MigrateCommon *args)
169 g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
170 FILE_TEST_FILENAME);
171 args->connect_uri = uri;
180 - args->listen_uri = "defer";
172
173 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] = true;
174 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
@@ -191,7 +182,6 @@ static void test_multifd_file_mapped_ram(char *name, MigrateCommon *args)
182 FILE_TEST_FILENAME);
183
184 args->connect_uri = uri;
194 - args->listen_uri = "defer";
185
186 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] = true;
187 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
@@ -213,7 +203,6 @@ static void test_multifd_file_mapped_ram_dio(char *name, MigrateCommon *args)
203 g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
204 FILE_TEST_FILENAME);
205 args->connect_uri = uri;
216 - args->listen_uri = "defer";
206 args->start_hook = migrate_hook_start_multifd_mapped_ram_dio;
207
208 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
@@ -285,7 +274,6 @@ static void test_multifd_file_mapped_ram_fdset(char *name, MigrateCommon *args)
274 FILE_TEST_OFFSET);
275
276 args->connect_uri = uri;
288 - args->listen_uri = "defer";
277 args->start_hook = migrate_hook_start_multifd_mapped_ram_fdset;
278 args->end_hook = migrate_hook_end_multifd_mapped_ram_fdset;
279
@@ -301,7 +289,6 @@ static void test_multifd_file_mapped_ram_fdset_dio(char *name,
289 g_autofree char *uri = g_strdup_printf("file:/dev/fdset/1,offset=%d",
290 FILE_TEST_OFFSET);
291 args->connect_uri = uri;
304 - args->listen_uri = "defer";
292 args->start_hook = migrate_hook_start_multifd_mapped_ram_fdset_dio;
293 args->end_hook = migrate_hook_end_multifd_mapped_ram_fdset;
294
@@ -332,7 +319,6 @@ test_precopy_file_mapped_ram_ignore_shared(char *name, MigrateCommon *args)
319 g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
320 FILE_TEST_FILENAME);
321 args->connect_uri = uri;
335 - args->listen_uri = "defer";
322
323 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
324 args->start.caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED] = true;
tests/qtest/migration/framework.c
+1 -1
@@ -972,7 +972,7 @@ void test_file_common(MigrateCommon *args, bool stop_src)
972 void *data_hook = NULL;
973 bool check_offset = false;
974
975 - if (migrate_start(&from, &to, args->listen_uri, &args->start)) {
975 + if (migrate_start(&from, &to, "defer", &args->start)) {
976 return;
977 }
978