[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [FOR 0.12 PATCH v2] Check rom_load_all() return value.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [FOR 0.12 PATCH v2] Check rom_load_all() return value. |
Date: |
Mon, 14 Dec 2009 16:07:35 +0100 |
Check rom_load_all() return value.
Also don't make option rom loading failure fatal.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/loader.c | 2 +-
vl.c | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
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) {
--
1.6.5.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [FOR 0.12 PATCH v2] Check rom_load_all() return value.,
Gerd Hoffmann <=