From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPeag-00052x-Lv for qemu-devel@nongnu.org; Mon, 17 Mar 2014 16:57:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPeaX-0001EF-OU for qemu-devel@nongnu.org; Mon, 17 Mar 2014 16:56:58 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:37775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPeaX-0001E4-FB for qemu-devel@nongnu.org; Mon, 17 Mar 2014 16:56:49 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 17 Mar 2014 20:56:48 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id EF35C1B0805F for ; Mon, 17 Mar 2014 20:56:35 +0000 (GMT) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4076.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s2HKuY9G49938500 for ; Mon, 17 Mar 2014 20:56:34 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s2HKukaq028120 for ; Mon, 17 Mar 2014 14:56:46 -0600 Message-ID: <5327618D.5070007@de.ibm.com> Date: Mon, 17 Mar 2014 21:56:45 +0100 From: Christian Borntraeger MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] small memory leak due to MachineClass rework List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: "qemu-devel@nongnu.org" , =?ISO-8859-1?Q?Andreas_F=E4rber?= , "Michael S. Tsirkin" Marcel, after commit 261747f176f6 (vl: Use MachineClass instead of global QEMUMachine list) valgrind complains about the following: ==54082== 57 bytes in 3 blocks are definitely lost in loss record 365 of 729 ==54082== at 0x4031AFE: malloc (vg_replace_malloc.c:292) ==54082== by 0x4145569: g_malloc (in /usr/lib64/libglib-2.0.so.0.3400.2) ==54082== by 0x415F9E9: g_strconcat (in /usr/lib64/libglib-2.0.so.0.3400.2) ==54082== by 0x80157FE7: qemu_register_machine (vl.c:1597) ==54082== by 0x80208E6B: module_call_init (module.c:105) ==54082== by 0x80013B91: main (vl.c:3000) Turns out that valgrind is right. We simply forget the memory that g_strconcat has allocated. This fixes the small leak, but I have to cast away the constness of .name. Any better ideas? diff --git a/vl.c b/vl.c index 03488b9..b06d186 100644 --- a/vl.c +++ b/vl.c @@ -1594,13+1594,14 @@ static void machine_class_init(ObjectClass *oc, void *data) int qemu_register_machine(QEMUMachine *m) { TypeInfo ti = { .name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL), .parent = TYPE_MACHINE, .class_init = machine_class_init, .class_data = (void *)m, }; type_register(&ti); + g_free((gpointer) ti.name); return 0; }