tests/qtest: Don't dup machine name in qtest_cb_for_every_machine callbacks
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é <philmd@linaro.org> Link: https://lore.kernel.org/qemu-devel/20260313182957.28432-2-farosas@suse.de Signed-off-by: Fabiano Rosas <farosas@suse.de>
Fabiano Rosas committed
Mar 13, 2026 at 15:29 UTC
b9b1ca5162523df9e0dc921c3b10341e299ce778
3 files changed
+7
-10
tests/qtest/cpu-plug-test.c
+5
-6
@@ -14,7 +14,7 @@
14
#include "qobject/qlist.h"
15
16
struct PlugTestData {
17
- char *machine;
17
+ const char *machine;
18
const char *cpu_model;
19
char *device_model;
20
unsigned sockets;
@@ -73,7 +73,6 @@ static void test_data_free(gpointer data)
73
{
74
PlugTestData *pc = data;
75
76
- g_free(pc->machine);
76
g_free(pc->device_model);
77
g_free(pc);
78
}
@@ -87,7 +86,7 @@ static void add_pc_test_case(const char *mname)
86
return;
87
}
88
data = g_new(PlugTestData, 1);
90
- data->machine = g_strdup(mname);
89
+ data->machine = mname;
90
data->cpu_model = "Haswell"; /* 1.3+ theoretically */
91
data->device_model = g_strdup_printf("%s-%s-cpu", data->cpu_model,
92
qtest_get_arch());
@@ -114,7 +113,7 @@ static void add_pseries_test_case(const char *mname)
113
return;
114
}
115
data = g_new(PlugTestData, 1);
117
- data->machine = g_strdup(mname);
116
+ data->machine = mname;
117
data->cpu_model = "power8_v2.0";
118
data->device_model = g_strdup("power8_v2.0-spapr-cpu-core");
119
data->sockets = 2;
@@ -140,7 +139,7 @@ static void add_s390x_test_case(const char *mname)
139
}
140
141
data = g_new(PlugTestData, 1);
143
- data->machine = g_strdup(mname);
142
+ data->machine = mname;
143
data->cpu_model = "qemu";
144
data->device_model = g_strdup("qemu-s390x-cpu");
145
data->sockets = 1;
@@ -162,7 +161,7 @@ static void add_loongarch_test_case(const char *mname)
161
PlugTestData *data;
162
163
data = g_new(PlugTestData, 1);
165
- data->machine = g_strdup(mname);
164
+ data->machine = mname;
165
data->cpu_model = "la464";
166
data->device_model = g_strdup("la464-loongarch-cpu");
167
data->sockets = 1;
tests/qtest/qom-test.c
+1
-2
@@ -216,7 +216,6 @@ static void test_machine(gconstpointer data)
216
test_list_get_value(qts);
217
218
qtest_quit(qts);
219
- g_free((void *)machine);
219
}
220
221
static void add_machine_test_case(const char *mname)
@@ -224,7 +223,7 @@ static void add_machine_test_case(const char *mname)
223
char *path;
224
225
path = g_strdup_printf("qom/%s", mname);
227
- qtest_add_data_func(path, g_strdup(mname), test_machine);
226
+ qtest_add_data_func(path, mname, test_machine);
227
g_free(path);
228
}
229
tests/qtest/test-hmp.c
+1
-2
@@ -135,7 +135,6 @@ static void test_machine(gconstpointer data)
135
136
qtest_quit(qts);
137
g_free(args);
138
- g_free((void *)data);
138
}
139
140
static void add_machine_test_case(const char *mname)
@@ -143,7 +142,7 @@ static void add_machine_test_case(const char *mname)
142
char *path;
143
144
path = g_strdup_printf("hmp/%s", mname);
146
- qtest_add_data_func(path, g_strdup(mname), test_machine);
145
+ qtest_add_data_func(path, mname, test_machine);
146
g_free(path);
147
}
148