* [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename
@ 2015-04-02 9:52 Peter Maydell
2015-04-02 10:37 ` Stefan Weil
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Peter Maydell @ 2015-04-02 9:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Weil, Gonglei, Michael Tokarev, Shannon Zhao, patches
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 <peter.maydell@linaro.org>
---
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
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename
2015-04-02 9:52 [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename Peter Maydell
@ 2015-04-02 10:37 ` Stefan Weil
2015-04-02 10:39 ` Peter Maydell
2015-04-02 11:14 ` Gonglei
2015-04-02 11:49 ` Peter Maydell
2 siblings, 1 reply; 5+ messages in thread
From: Stefan Weil @ 2015-04-02 10:37 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Gonglei, Michael Tokarev, Shannon Zhao, patches
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 <peter.maydell@linaro.org>
> ---
> 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 <sw@weilnetz.de>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename
2015-04-02 10:37 ` Stefan Weil
@ 2015-04-02 10:39 ` Peter Maydell
0 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2015-04-02 10:39 UTC (permalink / raw)
To: Stefan Weil
Cc: Shannon Zhao, Gonglei, Michael Tokarev, QEMU Developers,
Patch Tracking
On 2 April 2015 at 11:37, Stefan Weil <sw@weilnetz.de> wrote:
> 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 <peter.maydell@linaro.org>
>> ---
>> 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 <sw@weilnetz.de>
Did you mean reviewed-by ?
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename
2015-04-02 9:52 [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename Peter Maydell
2015-04-02 10:37 ` Stefan Weil
@ 2015-04-02 11:14 ` Gonglei
2015-04-02 11:49 ` Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Gonglei @ 2015-04-02 11:14 UTC (permalink / raw)
To: Peter Maydell, qemu-devel
Cc: Stefan Weil, Michael Tokarev, Shannon Zhao, patches
On 2015/4/2 17:52, Peter Maydell wrote:
> 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 <peter.maydell@linaro.org>
> ---
> 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
>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename
2015-04-02 9:52 [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename Peter Maydell
2015-04-02 10:37 ` Stefan Weil
2015-04-02 11:14 ` Gonglei
@ 2015-04-02 11:49 ` Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2015-04-02 11:49 UTC (permalink / raw)
To: QEMU Developers
Cc: Stefan Weil, Gonglei, Michael Tokarev, Shannon Zhao,
Patch Tracking
On 2 April 2015 at 10:52, Peter Maydell <peter.maydell@linaro.org> wrote:
> 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 <peter.maydell@linaro.org>
> ---
> 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(-)
Applied to master, thanks.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-04-02 11:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-02 9:52 [Qemu-devel] [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename Peter Maydell
2015-04-02 10:37 ` Stefan Weil
2015-04-02 10:39 ` Peter Maydell
2015-04-02 11:14 ` Gonglei
2015-04-02 11:49 ` Peter Maydell
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).