[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/26] tests: pc-cpu-test leaks fixes
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 24/26] tests: pc-cpu-test leaks fixes |
Date: |
Tue, 6 Sep 2016 16:26:37 +0400 |
The path is allocated and should be freed.
The qmp response should be unref, but then 'machine' must be duplicated.
Use a destroy function for the PCTestData.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/pc-cpu-test.c | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c
index 4428cea..c3a2633 100644
--- a/tests/pc-cpu-test.c
+++ b/tests/pc-cpu-test.c
@@ -14,7 +14,7 @@
#include "qapi/qmp/types.h"
struct PCTestData {
- const char *machine;
+ char *machine;
const char *cpu_model;
unsigned sockets;
unsigned cores;
@@ -71,6 +71,14 @@ static void test_pc_without_cpu_add(gconstpointer data)
g_free(args);
}
+static void test_data_free(gpointer data)
+{
+ PCTestData *pc = data;
+
+ g_free(pc->machine);
+ g_free(pc);
+}
+
static void add_pc_test_cases(void)
{
QDict *response, *minfo;
@@ -78,7 +86,8 @@ static void add_pc_test_cases(void)
const QListEntry *p;
QObject *qobj;
QString *qstr;
- const char *mname, *path;
+ const char *mname;
+ char *path;
PCTestData *data;
qtest_start("-machine none");
@@ -99,7 +108,7 @@ static void add_pc_test_cases(void)
continue;
}
data = g_malloc(sizeof(PCTestData));
- data->machine = mname;
+ data->machine = g_strdup(mname);
data->cpu_model = "Haswell"; /* 1.3+ theoretically */
data->sockets = 1;
data->cores = 3;
@@ -119,14 +128,19 @@ static void add_pc_test_cases(void)
path = g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=%u",
mname, data->sockets, data->cores,
data->threads, data->maxcpus);
- qtest_add_data_func(path, data, test_pc_without_cpu_add);
+ qtest_add_data_func_full(path, data, test_pc_without_cpu_add,
+ test_data_free);
+ g_free(path);
} else {
path = g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=%u",
mname, data->sockets, data->cores,
data->threads, data->maxcpus);
- qtest_add_data_func(path, data, test_pc_with_cpu_add);
+ qtest_add_data_func_full(path, data, test_pc_with_cpu_add,
+ test_data_free);
+ g_free(path);
}
}
+ QDECREF(response);
qtest_end();
}
--
2.10.0
- [Qemu-devel] [PULL 14/26] pc: don't leak a20_line, (continued)
- [Qemu-devel] [PULL 14/26] pc: don't leak a20_line, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 16/26] acpi-build: fix array leak, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 15/26] machine: use class base init generated name, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 17/26] tests: fix qom-test leaks, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 18/26] pc: free i8259, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 19/26] pc: keep gsi reference, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 20/26] sd: free timer, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 21/26] ipmi: free extern timer, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 22/26] bus: simplify name handling, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 23/26] tests: add qtest_add_data_func_full, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 24/26] tests: pc-cpu-test leaks fixes,
Marc-André Lureau <=
- [Qemu-devel] [PULL 25/26] tests: fix rsp leak in postcopy-test, Marc-André Lureau, 2016/09/06
- [Qemu-devel] [PULL 26/26] tests: fix postcopy-test leaks, Marc-André Lureau, 2016/09/06
- Re: [Qemu-devel] [PULL 00/26] Leak patches, Peter Maydell, 2016/09/06