Patchwork [FOR,0.12,v2] Check rom_load_all() return value.

login
register
mail settings
Submitter Gerd Hoffmann
Date Dec. 14, 2009, 3:07 p.m.
Message ID <1260803255-23943-1-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/41112/
State New
Headers show

Comments

Gerd Hoffmann - Dec. 14, 2009, 3:07 p.m.
Check rom_load_all() return value.
Also don't make option rom loading failure fatal.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/loader.c |    2 +-
 vl.c        |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/loader.c b/hw/loader.c
index 2d7a2c4..89491a2 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -669,7 +669,7 @@  int rom_load_all(void)
                         "addr 0x" TARGET_FMT_plx
                         ", size 0x%zx, max 0x" TARGET_FMT_plx ")\n",
                         rom->name, addr, rom->romsize, rom->max);
-                return -1;
+                continue;
             }
         } else {
             /* fixed address requested */
diff --git a/vl.c b/vl.c
index fd70caa..fd93a94 100644
--- a/vl.c
+++ b/vl.c
@@ -6049,7 +6049,10 @@  int main(int argc, char **argv, char **envp)
 
     qdev_machine_creation_done();
 
-    rom_load_all();
+    if (rom_load_all() != 0) {
+        fprintf(stderr, "rom loading failed\n");
+        exit(1);
+    }
 
     qemu_system_reset();
     if (loadvm) {