The qtest_get_machines function caches the list of machines in a static variable. Dup'ing the machine->name string only serves to leak that memory when a single test is executed.
Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Link: https://lore.kernel.org/qemu-devel/[email protected] Signed-off-by: Fabiano Rosas <[email protected]> --- tests/qtest/cpu-plug-test.c | 11 +++++------ tests/qtest/qom-test.c | 3 +-- tests/qtest/test-hmp.c | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c index 0aa4ccc5b6..e68f39cf56 100644 --- a/tests/qtest/cpu-plug-test.c +++ b/tests/qtest/cpu-plug-test.c @@ -14,7 +14,7 @@ #include "qobject/qlist.h" struct PlugTestData { - char *machine; + const char *machine; const char *cpu_model; char *device_model; unsigned sockets; @@ -73,7 +73,6 @@ static void test_data_free(gpointer data) { PlugTestData *pc = data; - g_free(pc->machine); g_free(pc->device_model); g_free(pc); } @@ -87,7 +86,7 @@ static void add_pc_test_case(const char *mname) return; } data = g_new(PlugTestData, 1); - data->machine = g_strdup(mname); + data->machine = mname; data->cpu_model = "Haswell"; /* 1.3+ theoretically */ data->device_model = g_strdup_printf("%s-%s-cpu", data->cpu_model, qtest_get_arch()); @@ -114,7 +113,7 @@ static void add_pseries_test_case(const char *mname) return; } data = g_new(PlugTestData, 1); - data->machine = g_strdup(mname); + data->machine = mname; data->cpu_model = "power8_v2.0"; data->device_model = g_strdup("power8_v2.0-spapr-cpu-core"); data->sockets = 2; @@ -140,7 +139,7 @@ static void add_s390x_test_case(const char *mname) } data = g_new(PlugTestData, 1); - data->machine = g_strdup(mname); + data->machine = mname; data->cpu_model = "qemu"; data->device_model = g_strdup("qemu-s390x-cpu"); data->sockets = 1; @@ -162,7 +161,7 @@ static void add_loongarch_test_case(const char *mname) PlugTestData *data; data = g_new(PlugTestData, 1); - data->machine = g_strdup(mname); + data->machine = mname; data->cpu_model = "la464"; data->device_model = g_strdup("la464-loongarch-cpu"); data->sockets = 1; diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c index 2da9918e16..6421f2d9d9 100644 --- a/tests/qtest/qom-test.c +++ b/tests/qtest/qom-test.c @@ -216,7 +216,6 @@ static void test_machine(gconstpointer data) test_list_get_value(qts); qtest_quit(qts); - g_free((void *)machine); } static void add_machine_test_case(const char *mname) @@ -224,7 +223,7 @@ static void add_machine_test_case(const char *mname) char *path; path = g_strdup_printf("qom/%s", mname); - qtest_add_data_func(path, g_strdup(mname), test_machine); + qtest_add_data_func(path, mname, test_machine); g_free(path); } diff --git a/tests/qtest/test-hmp.c b/tests/qtest/test-hmp.c index 1b2e07522f..60f742e83f 100644 --- a/tests/qtest/test-hmp.c +++ b/tests/qtest/test-hmp.c @@ -135,7 +135,6 @@ static void test_machine(gconstpointer data) qtest_quit(qts); g_free(args); - g_free((void *)data); } static void add_machine_test_case(const char *mname) @@ -143,7 +142,7 @@ static void add_machine_test_case(const char *mname) char *path; path = g_strdup_printf("hmp/%s", mname); - qtest_add_data_func(path, g_strdup(mname), test_machine); + qtest_add_data_func(path, mname, test_machine); g_free(path); } -- 2.51.0
