Patchwork [1/6] pc_sysfw: Check for qemu_find_file() failure

login
register
mail settings
Submitter Stefan Hajnoczi
Date Jan. 4, 2013, 1:55 p.m.
Message ID <1357307750-1966-2-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/209459/
State New
Headers show

Comments

Stefan Hajnoczi - Jan. 4, 2013, 1:55 p.m.
From: Markus Armbruster <armbru@redhat.com>

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 <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/pc_sysfw.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch

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");