From 97fe84f5efbd4f3ded433b7da5daca1f8fd5a82f Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Wed, 11 Nov 2009 18:17:24 +0000 Subject: [PATCH] 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 --- hw/loader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/loader.c b/hw/loader.c index 9153b3845..7f9fc2157 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -51,6 +51,8 @@ #include +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; }