From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQGRR-0006NY-9a for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:22:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQGRL-0007E7-BW for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:21:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQGRL-0007E1-0o for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:21:51 -0400 Date: Wed, 19 Mar 2014 15:21:48 +0200 From: "Michael S. Tsirkin" Message-ID: <20140319132148.GA27827@redhat.com> References: <1395228267-34202-1-git-send-email-borntraeger@de.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1395228267-34202-1-git-send-email-borntraeger@de.ibm.com> Subject: Re: [Qemu-devel] [PATCHv2] vl.c: Fix memory leak in qemu_register_machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger Cc: Peter Maydell , "qemu-devel@nongnu.org" , Andreas =?iso-8859-1?Q?F=E4rber?= , Marcel Apfelbaum On Wed, Mar 19, 2014 at 12:24:27PM +0100, Christian Borntraeger wrote: > since 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. Lets free it after the type_register. > We need a 2nd variable due to constness of the name part of the > type structure. > > Signed-off-by: Christian Borntraeger Reviewed-by: Michael S. Tsirkin Andreas can you pick this up pls? > --- > vl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/vl.c b/vl.c > index f0fe48b..0e82f06 100644 > --- a/vl.c > +++ b/vl.c > @@ -1587,14 +1587,16 @@ static void machine_class_init(ObjectClass *oc, void *data) > > int qemu_register_machine(QEMUMachine *m) > { > + char *name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL); > TypeInfo ti = { > - .name = g_strconcat(m->name, TYPE_MACHINE_SUFFIX, NULL), > + .name = name, > .parent = TYPE_MACHINE, > .class_init = machine_class_init, > .class_data = (void *)m, > }; > > type_register(&ti); > + g_free(name); > > return 0; > } > -- > 1.8.4.2