loader: allow adding ROMs in done callbacks

Don't abort if machine done callbacks add ROMs.

Reviewed-by: Gerd Hoffmann <[email protected]>
Tested-by: Gerd Hoffmann <[email protected]>
Reviewed-by: Igor Mammedov <[email protected]>
Tested-by: Igor Mammedov <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>

diff --git a/hw/core/loader.c b/hw/core/loader.c
index 060729f140222d02071dccee775480d8e723068a..60d2ebd4ac85d98079fd65cf3d5d955709ca02f3 100644 (file)
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -812,10 +812,14 @@ int rom_load_all(void)
         memory_region_unref(section.mr);
     }
     qemu_register_reset(rom_reset, NULL);
-    roms_loaded = 1;
     return 0;
 }
 
+void rom_load_done(void)
+{
+    roms_loaded = 1;
+}
+
 void rom_set_fw(FWCfgState *f)
 {
     fw_cfg = f;

diff --git a/include/hw/loader.h b/include/hw/loader.h
index e0c576b5e7e74e9715732b16fc6c71f5837134d9..58eca9832bb2468d03e920418eda416b724886b5 100644 (file)
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -46,6 +46,7 @@ void *rom_add_blob(const char *name, const void *blob, size_t len,
 int rom_add_elf_program(const char *name, void *data, size_t datasize,
                         size_t romsize, hwaddr addr);
 int rom_load_all(void);
+void rom_load_done(void);
 void rom_set_fw(FWCfgState *f);
 int rom_copy(uint8_t *dest, hwaddr addr, size_t size);
 void *rom_ptr(hwaddr addr);

diff --git a/vl.c b/vl.c
index fb8006e0696d2e738a1fe9782bff51fea49e7149..46c29c42d8482cbdf5b57e3a39b32361fe7cba9c 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4339,6 +4339,9 @@ int main(int argc, char **argv, char **envp)
     qemu_register_reset(qbus_reset_all_fn, sysbus_get_default());
     qemu_run_machine_init_done_notifiers();
 
+    /* Done notifiers can load ROMs */
+    rom_load_done();
+
     qemu_system_reset(VMRESET_SILENT);
     if (loadvm) {
         if (load_vmstate(loadvm) < 0) {