| Message ID | 1427968334-14527-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 11f10cf8057dd5392171da061381f6c890b1e21d |
| Headers | show |
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
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
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
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(-)