aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2009-11-11 18:17:24 +0000
committerPaul Brook <paul@codesourcery.com>2009-11-11 18:21:20 +0000
commit97fe84f5efbd4f3ded433b7da5daca1f8fd5a82f (patch)
tree658482a3529076ef24b66b8da81e0406ff7a0001
parentf2d74978764f62d832d61ac17bb5d934ade58816 (diff)
Reject late rom loading
rom_+add_file/rom_add_blob only work correctly if called before load_all_roms. Enforce this rather than silently accepting and putting the rom in the wrong place at reset. Signed-off-by: Paul Brook <paul@codesourcery.com>
-rw-r--r--hw/loader.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/loader.c b/hw/loader.c
index 9153b38456..7f9fc2157a 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -51,6 +51,8 @@
#include <zlib.h>
+static int roms_loaded;
+
/* return the size or -1 if error */
int get_image_size(const char *filename)
{
@@ -540,6 +542,10 @@ static void rom_insert(Rom *rom)
{
Rom *item;
+ if (roms_loaded) {
+ hw_error ("ROM images must be loaded at startup\n");
+ }
+
/* list is ordered by load address */
QTAILQ_FOREACH(item, &roms, next) {
if (rom->min >= item->min)
@@ -682,6 +688,7 @@ int rom_load_all(void)
rom->isrom = 1;
}
qemu_register_reset(rom_reset, NULL);
+ roms_loaded = 1;
return 0;
}