diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2009-12-14 16:07:35 +0100 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-19 08:26:22 -0600 |
commit | 4a0e0accd76ba05eb561833311b1b4325c3dea25 (patch) | |
tree | d5c54afc6f73b3faaa64383183d5c85894e0b406 | |
parent | 73e47683de970c33c8852cbb02aba1a6da38d407 (diff) |
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)
-rw-r--r-- | hw/loader.c | 2 | ||||
-rw-r--r-- | vl.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hw/loader.c b/hw/loader.c index 4c6981fc40..dd4a9a2b1c 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 */ @@ -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) { |