From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V21Ug-00024y-Ie for qemu-devel@nongnu.org; Wed, 24 Jul 2013 12:00:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V21Ua-0002Nc-3S for qemu-devel@nongnu.org; Wed, 24 Jul 2013 12:00:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55142) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V21UZ-0002NW-OD for qemu-devel@nongnu.org; Wed, 24 Jul 2013 12:00:44 -0400 Date: Wed, 24 Jul 2013 19:02:03 +0300 From: "Michael S. Tsirkin" Message-ID: <1374681580-17439-9-git-send-email-mst@redhat.com> References: <1374681580-17439-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1374681580-17439-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PATCH v3 08/14] loader: allow adding ROMs in done callbacks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori Don't abort if machine done callbacks add ROMs. Signed-off-by: Michael S. Tsirkin --- 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