From: Fabiano Rosas <farosas@suse.de>
Most file: tests use the same URI. Make it a 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-4-farosas@suse.de
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tests/qtest/migration/file-tests.c | 29 -----------------------------
tests/qtest/migration/framework.c | 6 ++++++
2 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/tests/qtest/migration/file-tests.c b/tests/qtest/migration/file-tests.c
index 75135447f8..4b6a2eeb7b 100644
--- a/tests/qtest/migration/file-tests.c
+++ b/tests/qtest/migration/file-tests.c
@@ -67,9 +67,6 @@ static void test_file_connect_outgoing_fd_leak(char *name, MigrateCommon *args)
static void test_precopy_file(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
- FILE_TEST_FILENAME);
- args->connect_uri = uri;
test_file_common(args, true);
}
@@ -142,11 +139,6 @@ static void test_precopy_file_offset_bad(char *name, MigrateCommon *args)
static void test_precopy_file_mapped_ram_live(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
- FILE_TEST_FILENAME);
-
- args->connect_uri = uri;
-
args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
test_file_common(args, false);
@@ -154,11 +146,6 @@ static void test_precopy_file_mapped_ram_live(char *name, MigrateCommon *args)
static void test_precopy_file_mapped_ram(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
- FILE_TEST_FILENAME);
-
- args->connect_uri = uri;
-
args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
test_file_common(args, true);
@@ -166,10 +153,6 @@ static void test_precopy_file_mapped_ram(char *name, MigrateCommon *args)
static void test_multifd_file_mapped_ram_live(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
- FILE_TEST_FILENAME);
- args->connect_uri = uri;
-
args->start.caps[MIGRATION_CAPABILITY_MULTIFD] = true;
args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
@@ -178,11 +161,6 @@ static void test_multifd_file_mapped_ram_live(char *name, MigrateCommon *args)
static void test_multifd_file_mapped_ram(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
- FILE_TEST_FILENAME);
-
- args->connect_uri = uri;
-
args->start.caps[MIGRATION_CAPABILITY_MULTIFD] = true;
args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
@@ -200,9 +178,6 @@ static void *migrate_hook_start_multifd_mapped_ram_dio(QTestState *from,
static void test_multifd_file_mapped_ram_dio(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
- FILE_TEST_FILENAME);
- args->connect_uri = uri;
args->start_hook = migrate_hook_start_multifd_mapped_ram_dio;
args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
@@ -316,10 +291,6 @@ static void migration_test_add_file_smoke(MigrationTestEnv *env)
static void
test_precopy_file_mapped_ram_ignore_shared(char *name, MigrateCommon *args)
{
- g_autofree char *uri = g_strdup_printf("file:%s/%s", tmpfs,
- FILE_TEST_FILENAME);
- args->connect_uri = uri;
-
args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] = true;
args->start.caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED] = true;
diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c
index a0c80c0a61..3802c6f57d 100644
--- a/tests/qtest/migration/framework.c
+++ b/tests/qtest/migration/framework.c
@@ -971,11 +971,17 @@ void test_file_common(MigrateCommon *args, bool stop_src)
QTestState *from, *to;
void *data_hook = NULL;
bool check_offset = false;
+ g_autofree char *uri = NULL;
if (migrate_start(&from, &to, "defer", &args->start)) {
return;
}
+ if (!args->connect_uri) {
+ uri = g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME);
+ args->connect_uri = uri;
+ }
+
/*
* File migration is never live. We can keep the source VM running
* during migration, but the destination will not be running
--
2.53.0