From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VT7CL-0003rM-Hi for qemu-devel@nongnu.org; Mon, 07 Oct 2013 05:33:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VT7CF-0000wj-D4 for qemu-devel@nongnu.org; Mon, 07 Oct 2013 05:33:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VT7CF-0000wL-5C for qemu-devel@nongnu.org; Mon, 07 Oct 2013 05:33:47 -0400 Date: Mon, 7 Oct 2013 12:36:09 +0300 From: "Michael S. Tsirkin" Message-ID: <1381138458-6848-18-git-send-email-mst@redhat.com> References: <1381138458-6848-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1381138458-6848-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH v9 17/27] loader: allow adding ROMs in done callbacks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori Cc: pbonzini@redhat.com, imammedo@redhat.com, afaerber@suse.de, kraxel@redhat.com Don't abort if machine done callbacks add ROMs. Reviewed-by: Gerd Hoffmann Tested-by: Gerd Hoffmann Signed-off-by: Michael S. Tsirkin --- include/hw/loader.h | 1 + hw/core/loader.c | 6 +++++- vl.c | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/hw/loader.h b/include/hw/loader.h index e0c576b..58eca98 100644 --- 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/hw/core/loader.c b/hw/core/loader.c index 060729f..60d2ebd 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; diff --git a/vl.c b/vl.c index fb8006e..46c29c4 100644 --- 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) { -- MST