From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbxjl-000241-2K for qemu-devel@nongnu.org; Fri, 23 Nov 2012 13:12:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tbxjj-0001Wt-Ay for qemu-devel@nongnu.org; Fri, 23 Nov 2012 13:12:25 -0500 From: Markus Armbruster Date: Fri, 23 Nov 2012 19:12:18 +0100 Message-Id: <1353694338-13162-3-git-send-email-armbru@redhat.com> In-Reply-To: <1353694338-13162-1-git-send-email-armbru@redhat.com> References: <1353694338-13162-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, jordan.l.justen@intel.com 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 --- 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 066c4fe..67fe87b 100644 --- a/hw/pc_sysfw.c +++ b/hw/pc_sysfw.c @@ -103,7 +103,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.7.11.7