From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgwUZ-0002zb-PY for qemu-devel@nongnu.org; Fri, 07 Dec 2012 06:53:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgwUT-0005Wb-AW for qemu-devel@nongnu.org; Fri, 07 Dec 2012 06:53:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgwHJ-0002LY-Ml for qemu-devel@nongnu.org; Fri, 07 Dec 2012 06:39:37 -0500 From: Stefan Hajnoczi Date: Fri, 7 Dec 2012 12:39:12 +0100 Message-Id: <1354880352-9597-14-git-send-email-stefanha@redhat.com> In-Reply-To: <1354880352-9597-1-git-send-email-stefanha@redhat.com> References: <1354880352-9597-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 13/13] 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: Anthony Liguori , Markus Armbruster , Stefan Hajnoczi From: Markus Armbruster 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 Signed-off-by: Stefan Hajnoczi --- 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