[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/13] pc_sysfw: Plug memory leak on pc_fw_add_pflas
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 13/13] pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path |
Date: |
Fri, 7 Dec 2012 12:39:12 +0100 |
From: Markus Armbruster <address@hidden>
Harmless, because we the error inevitably leads to another, fatal one
in pc_system_flash_init(): PC system firmware (pflash) not available.
Fix it anyway.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/pc_sysfw.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c
index 9d7c5f4..40bced2 100644
--- a/hw/pc_sysfw.c
+++ b/hw/pc_sysfw.c
@@ -98,7 +98,9 @@ static void pc_fw_add_pflash_drv(void)
return;
}
- drive_init(opts, machine->use_scsi);
+ if (!drive_init(opts, machine->use_scsi)) {
+ qemu_opts_del(opts);
+ }
}
static void pc_system_flash_init(MemoryRegion *rom_memory,
--
1.8.0.1
- [Qemu-devel] [PULL 00/13] Trivial patches for 2 to 7 November, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 11/13] Fix spelling in comments and documentation, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 05/13] s390x: Spelling fixes (endianess -> endianness, occured -> occurred), Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 10/13] Clean up pci_drive_hot_add()'s use of BlockInterfaceType, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 02/13] configure: Remove stray debug output, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 12/13] qemu-options: Fix space at EOL, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 13/13] pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 03/13] Fix spelling (prefered -> preferred), Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 09/13] arm: a9mpcore: remove un-used ptimer_iomem field, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 06/13] target-alpha: Remove t0, t1 from CPUAlphaState, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 07/13] target-m68k: Remove t1 from CPUM68KState, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 08/13] target-sparc: Remove t0, t1 from CPUSPARCState, Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 04/13] Fix comments (adress -> address, layed -> laid, wierd -> weird), Stefan Hajnoczi, 2012/12/07
- [Qemu-devel] [PATCH 01/13] sd: Send debug printfery to stderr not stdout, Stefan Hajnoczi, 2012/12/07
- Re: [Qemu-devel] [PULL 00/13] Trivial patches for 2 to 7 November, Anthony Liguori, 2012/12/10