When the migration-test is invoked with the '-p' flag (to run a single
test), the glib code won't call the destroy function for the
not-executed tests, causing the MigrationTest wrapper data to leak.
This doesn't affect make check, but affects debugging use-cases where
having a leak pop up in ASAN output is extra annoying.
Fix by adding the tests data to a list and freeing them all at the end
of migration-test execution. Any tests actually dispatched by glib
will have the destroy function called as usual.
Note that migration_test_add_suffix() is altered to call
migration_test_add() so that there's only one place adding the data to
the list.
Performance is not an issue at the moment, we have < 100 tests.
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Prasad Pandit <pjp@fedoraproject.org>
Link: https://lore.kernel.org/qemu-devel/20260311213418.16951-2-farosas@suse.de
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
tests/qtest/migration/framework.c | 2 ++
tests/qtest/migration/migration-util.c | 19 ++++++++++++++-----
tests/qtest/migration/migration-util.h | 2 +-
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c
index 0bfc241914..b9371372de 100644
--- a/tests/qtest/migration/framework.c
+++ b/tests/qtest/migration/framework.c
@@ -1162,5 +1162,7 @@ int migration_env_clean(MigrationTestEnv *env)
}
g_free(tmpfs);
+ migration_tests_free();
+
return ret;
}
diff --git a/tests/qtest/migration/migration-util.c b/tests/qtest/migration/migration-util.c
index c2462306a1..2648ad7f61 100644
--- a/tests/qtest/migration/migration-util.c
+++ b/tests/qtest/migration/migration-util.c
@@ -38,6 +38,7 @@
#include "linux/kvm.h"
#endif
+GQueue *tests;
static char *SocketAddress_to_str(SocketAddress *addr)
{
@@ -243,6 +244,8 @@ static void migration_test_destroy(gpointer data)
{
MigrationTest *test = (MigrationTest *)data;
+ g_queue_remove(tests, test);
+
g_free(test->data);
g_free(test->name);
g_free(test);
@@ -268,21 +271,27 @@ void migration_test_add(const char *path,
qtest_add_data_func_full(path, test, migration_test_wrapper,
migration_test_destroy);
+ if (!tests) {
+ tests = g_queue_new();
+ }
+ g_queue_push_tail(tests, test);
}
void migration_test_add_suffix(const char *path, const char *suffix,
void (*fn)(char *name, MigrateCommon *args))
{
- MigrationTest *test = g_new0(MigrationTest, 1);
+ g_autofree char *name = NULL;
g_assert(g_str_has_suffix(path, "/"));
g_assert(!g_str_has_prefix(suffix, "/"));
- test->func = fn;
- test->name = g_strconcat(path, suffix, NULL);
+ name = g_strconcat(path, suffix, NULL);
+ migration_test_add(name, fn);
+}
- qtest_add_data_func_full(test->name, test, migration_test_wrapper,
- migration_test_destroy);
+void migration_tests_free(void)
+{
+ g_queue_free_full(tests, migration_test_destroy);
}
#ifdef O_DIRECT
diff --git a/tests/qtest/migration/migration-util.h b/tests/qtest/migration/migration-util.h
index e73d69bab0..694773e594 100644
--- a/tests/qtest/migration/migration-util.h
+++ b/tests/qtest/migration/migration-util.h
@@ -59,5 +59,5 @@ void migration_test_add_suffix(const char *path, const char *suffix,
void (*fn)(char *name, MigrateCommon *args));
char *migrate_get_connect_uri(QTestState *who);
void migrate_set_ports(QTestState *to, QList *channel_list);
-
+void migration_tests_free(void);
#endif /* MIGRATION_UTIL_H */
--
2.51.0