From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdcUx-00057X-Cl for qemu-devel@nongnu.org; Thu, 02 Apr 2015 06:37:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdcUr-0003fm-5U for qemu-devel@nongnu.org; Thu, 02 Apr 2015 06:37:19 -0400 Received: from mail-r83.rz.uni-mannheim.de ([134.155.96.83]:54545) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdcUq-0003fZ-WA for qemu-devel@nongnu.org; Thu, 02 Apr 2015 06:37:13 -0400 Message-ID: <551D1BDC.9010609@weilnetz.de> Date: Thu, 02 Apr 2015 12:37:16 +0200 From: Stefan Weil MIME-Version: 1.0 References: <1427968334-14527-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1427968334-14527-1-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: Gonglei , Michael Tokarev , Shannon Zhao , patches@linaro.org Am 02.04.2015 um 11:52 schrieb Peter Maydell: > Commits 6e05a12f8f7f and db25a1581 both attempt to fix the > same "failed to free memory containing flash filename" bug, > with the effect that when they were both applied we ended > up freeing the memory twice. Delete the spurious extra free. > > Signed-off-by: Peter Maydell > --- > Shannon's patch fixes the virt.c board; I checked the other > boards touched by 6e05a12f8f7f and they don't have the problem > (either due to no conflicting patch or because the g_free() > calls were in the same place and the merge combined them.) > > hw/arm/vexpress.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c > index dd04527..54dd967 100644 > --- a/hw/arm/vexpress.c > +++ b/hw/arm/vexpress.c > @@ -583,7 +583,6 @@ static void vexpress_common_init(MachineState *machine) > error_report("Could not load ROM image '%s'", bios_name); > exit(1); > } > - g_free(fn); > } > > /* Motherboard peripherals: the wiring is the same but the Signed-off-by: Stefan Weil