From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47616)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1Ybgdf-0006Bz-UR
	for qemu-devel@nongnu.org; Fri, 27 Mar 2015 22:38:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <arei.gonglei@huawei.com>) id 1Ybgdb-00054V-TF
	for qemu-devel@nongnu.org; Fri, 27 Mar 2015 22:38:19 -0400
Message-ID: <55161404.4000404@huawei.com>
Date: Sat, 28 Mar 2015 10:37:56 +0800
From: Gonglei <arei.gonglei@huawei.com>
MIME-Version: 1.0
References: <1425524720-11376-1-git-send-email-arei.gonglei@huawei.com>
	<5507D480.1000505@huawei.com>
In-Reply-To: <5507D480.1000505@huawei.com>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v2] microblaze: fix memory leak
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "pbonzini@redhat.com" <pbonzini@redhat.com>, Michael Tokarev <mjt@tls.msk.ru>, Peter Maydell <peter.maydell@linaro.org>

Hi,

   Ping again...  Can this patch be a raw stuff for rc2 ?

Regards,
Gonglei

On 2015/3/17 15:15, Gonglei wrote:
> On 2015/3/5 11:05, arei.gonglei@huawei.com wrote:
>> From: Gonglei <arei.gonglei@huawei.com>
>>
>> When not assign a -dtb argument, the variable dtb_filename
>> storage returned from qemu_find_file(), which should be freed
>> after use. Alternatively we define a local variable filename,
>> with 'char *' type, free after use.
>>
>> Cc: Michael Tokarev <mjt@tls.msk.ru>
>> Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
>> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>> ---
>> v2: fix a complier error.
>> ---
>>  hw/microblaze/boot.c | 13 +++++++------
>>  1 file changed, 7 insertions(+), 6 deletions(-)
>>
> 
> Ping...
> 
>> diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c
>> index a2843cd..352ccb1 100644
>> --- a/hw/microblaze/boot.c
>> +++ b/hw/microblaze/boot.c
>> @@ -113,15 +113,15 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
>>      const char *kernel_filename;
>>      const char *kernel_cmdline;
>>      const char *dtb_arg;
>> +    char *filename = NULL;
>>  
>>      machine_opts = qemu_get_machine_opts();
>>      kernel_filename = qemu_opt_get(machine_opts, "kernel");
>>      kernel_cmdline = qemu_opt_get(machine_opts, "append");
>>      dtb_arg = qemu_opt_get(machine_opts, "dtb");
>> -    if (dtb_arg) { /* Preference a -dtb argument */
>> -        dtb_filename = dtb_arg;
>> -    } else { /* default to pcbios dtb as passed by machine_init */
>> -        dtb_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);
>> +    /* default to pcbios dtb as passed by machine_init */
>> +    if (!dtb_arg) {
>> +        filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename);
>>      }
>>  
>>      boot_info.machine_cpu_reset = machine_cpu_reset;
>> @@ -203,7 +203,8 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
>>                              boot_info.initrd_start,
>>                              boot_info.initrd_end,
>>                              kernel_cmdline,
>> -                            dtb_filename);
>> +                            /* Preference a -dtb argument */
>> +                            dtb_arg ? dtb_arg : filename);
>>      }
>> -
>> +    g_free(filename);
>>  }
>>
>