Don't abort if machine done callbacks add ROMs.
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
---
hw/core/loader.c | 6 +++++-
include/hw/loader.h | 1 +
vl.c | 3 +++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index c2309e6..c68f757 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -778,10 +778,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 cdb7b4b..8f0d142 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -44,6 +44,7 @@ int 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 25b8f2f..3d56ec0 100644
--- a/vl.c
+++ b/vl.c
@@ -4408,6 +4408,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) {
--
MST
