commit d916b46494a2a477636a59900ab1609de192f47a
author Michael S. Tsirkin <mst@redhat.com> Wed Jul 24 18:56:08 2013 +0300
committer Michael S. Tsirkin <mst@redhat.com> Mon Oct 14 17:48:52 2013 +0300
tree 496c824eb085e443f536044c7e5d66d2ac722e98
parent bc70232918ad3fb45c2b5423455a5de6bc7efdef

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>

vl.c

diff --git a/vl.c b/vl.c
index fb8006e..46c29c4 100644
--- a/vl.c
+++ b/vl.c
@@ -4339,6 +4339,9 @@
     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) {