diff options
| author | Michael S. Tsirkin | 2013-07-24 17:56:08 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2013-10-14 16:48:52 +0200 |
| commit | d916b46494a2a477636a59900ab1609de192f47a (patch) | |
| tree | 496c824eb085e443f536044c7e5d66d2ac722e98 /hw/core | |
| parent | i386: add bios linker/loader (diff) | |
| download | qemu-d916b46494a2a477636a59900ab1609de192f47a.tar.gz qemu-d916b46494a2a477636a59900ab1609de192f47a.tar.xz qemu-d916b46494a2a477636a59900ab1609de192f47a.zip | |
loader: allow adding ROMs in done callbacks
Don't abort if machine done callbacks add ROMs.
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/loader.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c index 060729f140..60d2ebd4ac 100644 --- 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; |