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>
This commit is contained in:
Gerd Hoffmann 2009-12-14 16:07:35 +01:00 committed by Anthony Liguori
parent d8bcbabf26
commit 15ff770544
2 changed files with 5 additions and 2 deletions

View File

@ -669,7 +669,7 @@ int rom_load_all(void)
"addr 0x" TARGET_FMT_plx "addr 0x" TARGET_FMT_plx
", size 0x%zx, max 0x" TARGET_FMT_plx ")\n", ", size 0x%zx, max 0x" TARGET_FMT_plx ")\n",
rom->name, addr, rom->romsize, rom->max); rom->name, addr, rom->romsize, rom->max);
return -1; continue;
} }
} else { } else {
/* fixed address requested */ /* fixed address requested */

5
vl.c
View File

@ -6049,7 +6049,10 @@ int main(int argc, char **argv, char **envp)
qdev_machine_creation_done(); qdev_machine_creation_done();
rom_load_all(); if (rom_load_all() != 0) {
fprintf(stderr, "rom loading failed\n");
exit(1);
}
qemu_system_reset(); qemu_system_reset();
if (loadvm) { if (loadvm) {