From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 14 Dec 2009 15:07:35 +0000 (+0100)
Subject: Check rom_load_all() return value.
X-Git-Tag: v0.12.0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a0e0accd76ba05eb561833311b1b4325c3dea25;p=thirdparty%2Fqemu.git

Check rom_load_all() return value.

Check rom_load_all() return value.
Also don't make option rom loading failure fatal.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 15ff7705444ab9663189946d6d648431e0649df1)
---

diff --git a/hw/loader.c b/hw/loader.c
index 4c6981fc40c..dd4a9a2b1c7 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 95abe7e67fe..8d9d9c239ac 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) {