[Qemu-devel] [PATCH 1/3] pci: Fix memory leak

[Qemu-devel] [PATCH 1/3] pci: Fix memory leak

[Stefan Weil]

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/pci.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index 63f476a..38a60ae 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1877,6 +1877,7 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom)
     if (size < 0) {
         error_report("%s: failed to find romfile \"%s\"",
                      __FUNCTION__, pdev->romfile);
+        qemu_free(path);
         return -1;
     }
     if (size & (size - 1)) {
-- 
1.7.2.3

[Qemu-devel] [PATCH 2/3] ppc405: Fix memory leak

[Stefan Weil]

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/ppc405_boards.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index b1d2b94..912757b 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -560,6 +560,7 @@ static void taihu_405ep_init(ram_addr_t ram_size,
         filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
         if (filename) {
             bios_size = load_image(filename, qemu_get_ram_ptr(bios_offset));
+            qemu_free(filename);
         } else {
             bios_size = -1;
         }
-- 
1.7.2.3

[Qemu-devel] [PATCH 3/3] s390: Fix memory leak

[Stefan Weil]

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/s390-virtio.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index f29b624..850422f 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -204,6 +204,7 @@ static void s390_init(ram_addr_t ram_size,
 
         bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
         bios_size = load_image(bios_filename, qemu_get_ram_ptr(ZIPL_LOAD_ADDR));
+        qemu_free(bios_filename);
 
         if ((long)bios_size < 0) {
             hw_error("could not load bootloader '%s'\n", bios_name);
-- 
1.7.2.3

Re: [Qemu-devel] [PATCH 2/3] ppc405: Fix memory leak

[Andreas Färber]

Am 22.01.2011 um 13:02 schrieb Stefan Weil:

> Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Acked-by: Andreas Färber <andreas.faerber@web.de>

> ---
> hw/ppc405_boards.c |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
> index b1d2b94..912757b 100644
> --- a/hw/ppc405_boards.c
> +++ b/hw/ppc405_boards.c
> @@ -560,6 +560,7 @@ static void taihu_405ep_init(ram_addr_t ram_size,
>         filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
>         if (filename) {
>             bios_size = load_image(filename,  
> qemu_get_ram_ptr(bios_offset));
> +            qemu_free(filename);
>         } else {
>             bios_size = -1;
>         }

Untested but matches the 405 reference board and New World / Old  
World / PReP then.

Andreas

Re: [Qemu-devel] [PATCH 1/3] pci: Fix memory leak

[Aurelien Jarno]

On Sat, Jan 22, 2011 at 01:02:44PM +0100, Stefan Weil wrote:
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/pci.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Thanks all three patches applied.

> diff --git a/hw/pci.c b/hw/pci.c
> index 63f476a..38a60ae 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -1877,6 +1877,7 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom)
>      if (size < 0) {
>          error_report("%s: failed to find romfile \"%s\"",
>                       __FUNCTION__, pdev->romfile);
> +        qemu_free(path);
>          return -1;
>      }
>      if (size & (size - 1)) {
> -- 
> 1.7.2.3
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net