* [Qemu-devel] [PATCH v2] e500: fix memory leak
@ 2015-02-28 10:08 arei.gonglei
2015-02-28 10:13 ` Michael Tokarev
0 siblings, 1 reply; 8+ messages in thread
From: arei.gonglei @ 2015-02-28 10:08 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Gonglei, mjt
From: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
v2: fix compilation complaint. (mjt)
---
hw/ppc/e500.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 7e17d18..c060b50 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -309,8 +309,10 @@ static int ppce500_load_device_tree(MachineState *machine,
fdt = load_device_tree(filename, &fdt_size);
if (!fdt) {
+ g_free(filename);
goto out;
}
+ g_free(filename);
goto done;
}
--
1.7.12.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] e500: fix memory leak
2015-02-28 10:08 [Qemu-devel] [PATCH v2] e500: fix memory leak arei.gonglei
@ 2015-02-28 10:13 ` Michael Tokarev
2015-02-28 10:18 ` Gonglei
2015-02-28 16:40 ` Paolo Bonzini
0 siblings, 2 replies; 8+ messages in thread
From: Michael Tokarev @ 2015-02-28 10:13 UTC (permalink / raw)
To: arei.gonglei, qemu-devel; +Cc: qemu-trivial
28.02.2015 13:08, arei.gonglei@huawei.com пишет:
> From: Gonglei <arei.gonglei@huawei.com>
>
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> ---
> v2: fix compilation complaint. (mjt)
> ---
> hw/ppc/e500.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 7e17d18..c060b50 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -309,8 +309,10 @@ static int ppce500_load_device_tree(MachineState *machine,
>
> fdt = load_device_tree(filename, &fdt_size);
> if (!fdt) {
> + g_free(filename);
> goto out;
> }
> + g_free(filename);
> goto done;
> }
How about this?
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -308,6 +308,7 @@ static int ppce500_load_device_tree(MachineState *machine,
}
fdt = load_device_tree(filename, &fdt_size);
+ g_free(filename);
if (!fdt) {
goto out;
}
Thanks,
/mjt
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] e500: fix memory leak
2015-02-28 10:13 ` Michael Tokarev
@ 2015-02-28 10:18 ` Gonglei
2015-02-28 10:47 ` Michael Tokarev
2015-02-28 16:40 ` Paolo Bonzini
1 sibling, 1 reply; 8+ messages in thread
From: Gonglei @ 2015-02-28 10:18 UTC (permalink / raw)
To: Michael Tokarev, qemu-devel; +Cc: qemu-trivial
On 2015/2/28 18:13, Michael Tokarev wrote:
> 28.02.2015 13:08, arei.gonglei@huawei.com пишет:
>> From: Gonglei <arei.gonglei@huawei.com>
>>
>> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>> ---
>> v2: fix compilation complaint. (mjt)
>> ---
>> hw/ppc/e500.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
>> index 7e17d18..c060b50 100644
>> --- a/hw/ppc/e500.c
>> +++ b/hw/ppc/e500.c
>> @@ -309,8 +309,10 @@ static int ppce500_load_device_tree(MachineState *machine,
>>
>> fdt = load_device_tree(filename, &fdt_size);
>> if (!fdt) {
>> + g_free(filename);
>> goto out;
>> }
>> + g_free(filename);
>> goto done;
>> }
>
>
> How about this?
>
It's ok on function, but seems oddly, isn't it?
Regards,
-Gonglei
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -308,6 +308,7 @@ static int ppce500_load_device_tree(MachineState *machine,
> }
>
> fdt = load_device_tree(filename, &fdt_size);
> + g_free(filename);
> if (!fdt) {
> goto out;
> }
>
> Thanks,
>
> /mjt
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] e500: fix memory leak
2015-02-28 10:18 ` Gonglei
@ 2015-02-28 10:47 ` Michael Tokarev
0 siblings, 0 replies; 8+ messages in thread
From: Michael Tokarev @ 2015-02-28 10:47 UTC (permalink / raw)
To: Gonglei, qemu-devel; +Cc: qemu-trivial
28.02.2015 13:18, Gonglei wrote:
> On 2015/2/28 18:13, Michael Tokarev wrote:
[]
>> How about this?
>>
> It's ok on function, but seems oddly, isn't it?
I don't see anything odd in it. The `filename' variable is only
used as an argument for load_device_tree() function and is not used
anywhwere else, so it's logical to free it after use.
>> --- a/hw/ppc/e500.c
>> +++ b/hw/ppc/e500.c
>> @@ -308,6 +308,7 @@ static int ppce500_load_device_tree(MachineState *machine,
>> }
>>
>> fdt = load_device_tree(filename, &fdt_size);
>> + g_free(filename);
>> if (!fdt) {
>> goto out;
>> }
>>
Thanks,
/mjt
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] e500: fix memory leak
2015-02-28 10:13 ` Michael Tokarev
2015-02-28 10:18 ` Gonglei
@ 2015-02-28 16:40 ` Paolo Bonzini
2015-02-28 16:47 ` Stefan Weil
1 sibling, 1 reply; 8+ messages in thread
From: Paolo Bonzini @ 2015-02-28 16:40 UTC (permalink / raw)
To: Michael Tokarev, arei.gonglei, qemu-devel; +Cc: qemu-trivial
On 28/02/2015 11:13, Michael Tokarev wrote:
> 28.02.2015 13:08, arei.gonglei@huawei.com пишет:
>> From: Gonglei <arei.gonglei@huawei.com>
>>
>> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>> ---
>> v2: fix compilation complaint. (mjt)
>> ---
>> hw/ppc/e500.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
>> index 7e17d18..c060b50 100644
>> --- a/hw/ppc/e500.c
>> +++ b/hw/ppc/e500.c
>> @@ -309,8 +309,10 @@ static int ppce500_load_device_tree(MachineState *machine,
>>
>> fdt = load_device_tree(filename, &fdt_size);
>> if (!fdt) {
>> + g_free(filename);
>> goto out;
>> }
>> + g_free(filename);
>> goto done;
>> }
>
>
> How about this?
>
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -308,6 +308,7 @@ static int ppce500_load_device_tree(MachineState *machine,
> }
>
> fdt = load_device_tree(filename, &fdt_size);
> + g_free(filename);
> if (!fdt) {
> goto out;
> }
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
See also xilinx_load_device_tree:
/* Try the local "ppc.dtb" override. */
fdt = load_device_tree("ppc.dtb", &fdt_size);
if (!fdt) {
path = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
if (path) {
fdt = load_device_tree(path, &fdt_size);
g_free(path);
}
}
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] e500: fix memory leak
2015-02-28 16:40 ` Paolo Bonzini
@ 2015-02-28 16:47 ` Stefan Weil
2015-03-01 10:06 ` Paolo Bonzini
0 siblings, 1 reply; 8+ messages in thread
From: Stefan Weil @ 2015-02-28 16:47 UTC (permalink / raw)
To: Paolo Bonzini, Michael Tokarev, arei.gonglei, qemu-devel; +Cc: qemu-trivial
Am 28.02.2015 um 17:40 schrieb Paolo Bonzini:
> On 28/02/2015 11:13, Michael Tokarev wrote:
>> 28.02.2015 13:08, arei.gonglei@huawei.com пишет:
>>> From: Gonglei <arei.gonglei@huawei.com>
>>>
>>> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>>> ---
>>> v2: fix compilation complaint. (mjt)
>>> ---
>>> hw/ppc/e500.c | 2 ++
>>> 1 file changed, 2 insertions(+)
>>>
>>> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
>>> index 7e17d18..c060b50 100644
>>> --- a/hw/ppc/e500.c
>>> +++ b/hw/ppc/e500.c
>>> @@ -309,8 +309,10 @@ static int ppce500_load_device_tree(MachineState *machine,
>>>
>>> fdt = load_device_tree(filename, &fdt_size);
>>> if (!fdt) {
>>> + g_free(filename);
>>> goto out;
>>> }
>>> + g_free(filename);
>>> goto done;
>>> }
>>
>> How about this?
>>
>> --- a/hw/ppc/e500.c
>> +++ b/hw/ppc/e500.c
>> @@ -308,6 +308,7 @@ static int ppce500_load_device_tree(MachineState *machine,
>> }
>>
>> fdt = load_device_tree(filename, &fdt_size);
>> + g_free(filename);
>> if (!fdt) {
>> goto out;
>> }
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Which one of the two patch variants did you review?
I suggest using Michael's version (only one g_free as early as
possible). For that variant, my review may be added:
Reviewed-by: Stefan Weil <sw@weilnetz.de>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [Qemu-devel] [PATCH v2] e500: fix memory leak
2015-02-28 16:47 ` Stefan Weil
@ 2015-03-01 10:06 ` Paolo Bonzini
2015-03-02 1:17 ` Gonglei
0 siblings, 1 reply; 8+ messages in thread
From: Paolo Bonzini @ 2015-03-01 10:06 UTC (permalink / raw)
To: Stefan Weil, Michael Tokarev, arei.gonglei, qemu-devel; +Cc: qemu-trivial
On 28/02/2015 17:47, Stefan Weil wrote:
>> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
>
> Which one of the two patch variants did you review?
>
> I suggest using Michael's version (only one g_free as early as
> possible). For that variant, my review may be added:
>
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
I also referred to Michael's.
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v2] e500: fix memory leak
2015-03-01 10:06 ` Paolo Bonzini
@ 2015-03-02 1:17 ` Gonglei
0 siblings, 0 replies; 8+ messages in thread
From: Gonglei @ 2015-03-02 1:17 UTC (permalink / raw)
To: Paolo Bonzini, Stefan Weil, Michael Tokarev, qemu-devel; +Cc: qemu-trivial
On 2015/3/1 18:06, Paolo Bonzini wrote:
>
>
> On 28/02/2015 17:47, Stefan Weil wrote:
>>> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
>>
>> Which one of the two patch variants did you review?
>>
>> I suggest using Michael's version (only one g_free as early as
>> possible). For that variant, my review may be added:
>>
>> Reviewed-by: Stefan Weil <sw@weilnetz.de>
>
> I also referred to Michael's.
>
OK, thanks.
Michael, need I send another version? Or you own handle it directly?
Regards,
-Gonglei
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-03-02 1:17 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-28 10:08 [Qemu-devel] [PATCH v2] e500: fix memory leak arei.gonglei
2015-02-28 10:13 ` Michael Tokarev
2015-02-28 10:18 ` Gonglei
2015-02-28 10:47 ` Michael Tokarev
2015-02-28 16:40 ` Paolo Bonzini
2015-02-28 16:47 ` Stefan Weil
2015-03-01 10:06 ` Paolo Bonzini
2015-03-02 1:17 ` Gonglei
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).