From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tr7kt-0001h1-AZ for qemu-devel@nongnu.org; Fri, 04 Jan 2013 08:56:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tr7kl-0007QO-8g for qemu-devel@nongnu.org; Fri, 04 Jan 2013 08:56:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:24796) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tr7kl-0007QE-1V for qemu-devel@nongnu.org; Fri, 04 Jan 2013 08:56:07 -0500 From: Stefan Hajnoczi Date: Fri, 4 Jan 2013 14:55:45 +0100 Message-Id: <1357307750-1966-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1357307750-1966-1-git-send-email-stefanha@redhat.com> References: <1357307750-1966-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] pc_sysfw: Check for qemu_find_file() failure 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 pc_fw_add_pflash_drv() ignores qemu_find_file() failure, and happily creates a drive without a medium. When pc_system_flash_init() asks for its size, bdrv_getlength() fails with -ENOMEDIUM, which isn't checked either. It fails relatively cleanly only because -ENOMEDIUM isn't a multiple of 4096: $ qemu-system-x86_64 -S -vnc :0 -bios nonexistant qemu: PC system firmware (pflash) must be a multiple of 0x1000 [Exit 1 ] Fix by handling the qemu_find_file() failure. Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- hw/pc_sysfw.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c index 87e1fa9..7567593 100644 --- a/hw/pc_sysfw.c +++ b/hw/pc_sysfw.c @@ -84,6 +84,10 @@ static void pc_fw_add_pflash_drv(void) bios_name = BIOS_FILENAME; } filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); + if (!filename) { + error_report("Can't open BIOS image %s", bios_name); + exit(1); + } opts = drive_add(IF_PFLASH, -1, filename, "readonly=on"); -- 1.8.0.2