From 2acfbd5d40f5eed9631d06602052fde8bea14973 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 14 Dec 2009 16:07:35 +0100 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori --- 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 4c6981f..dd4a9a2 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 95abe7e..8d9d9c2 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) { -- 2.7.4