From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVJ8z-0002vU-NK for qemu-devel@nongnu.org; Thu, 04 Aug 2016 09:57:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVJ8v-0003nA-KN for qemu-devel@nongnu.org; Thu, 04 Aug 2016 09:57:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVJ8v-0003n0-EJ for qemu-devel@nongnu.org; Thu, 04 Aug 2016 09:57:01 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 127B6C04D2A9 for ; Thu, 4 Aug 2016 13:57:00 +0000 (UTC) From: Markus Armbruster References: <20160803145541.15355-1-marcandre.lureau@redhat.com> <20160803145541.15355-18-marcandre.lureau@redhat.com> Date: Thu, 04 Aug 2016 15:56:57 +0200 In-Reply-To: <20160803145541.15355-18-marcandre.lureau@redhat.com> (marcandre lureau's message of "Wed, 3 Aug 2016 18:55:22 +0400") Message-ID: <877fbwfxhy.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-2.7 v3 17/36] machine: use class base init generated name List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com Cc: qemu-devel@nongnu.org, pbonzini@redhat.com marcandre.lureau@redhat.com writes: > From: Marc-Andr=C3=A9 Lureau > > Remove machine class name initialization from DEFINE_PC_MACHINE, rely on > class base init name generation instead. Get rid of some leaks that way. > > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > hw/core/machine.c | 1 + > include/hw/boards.h | 2 +- > include/hw/i386/pc.h | 1 - > 3 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index e5a456f..00fbe3e 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -561,6 +561,7 @@ static void machine_class_finalize(ObjectClass *klass= , void *data) > if (mc->compat_props) { > g_array_free(mc->compat_props, true); > } > + g_free(mc->name); > } >=20=20 > void machine_register_compat_props(MachineState *machine) > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 3e69eca..e46a744 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -93,7 +93,7 @@ struct MachineClass { > /*< public >*/ >=20=20 > const char *family; /* NULL iff @name identifies a standalone machty= pe */ > - const char *name; > + char *name; > const char *alias; > const char *desc; >=20=20 > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index eb1d414..afd025a 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -903,7 +903,6 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64= _t *); > { \ > MachineClass *mc =3D MACHINE_CLASS(oc); \ > optsfn(mc); \ > - mc->name =3D namestr; \ > mc->init =3D initfn; \ > } \ > static const TypeInfo pc_machine_type_##suffix =3D { \ I guess there are is at least one assignment to mc->name not visible in this patch that assigns an allocated string, which leaks before the patch. The commit message seems to provide a clue "class base init name generation". I could probably find it with some effort, but patches that take that much work to understand make me grumpy. Please provide another clue :)