diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2010-01-08 15:25:40 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-12 14:48:19 -0600 |
| commit | 04babf6c6f8ccf69f1219db5fea233d679702e90 (patch) | |
| tree | e2ad26084db2f46799825b5fb0fdbd49e3c0ed82 /hw | |
| parent | d2b8117310eeed4cebb6f5fb685e57bf22fa6031 (diff) | |
roms: rework rom loading via fw
This patch changes the way rom loading via fw_cfg is handled.
Instead of having pc_init1() call a function which passed all
roms to the firmware config we simply pass a pointer to fw_cfg
to the rom loader.
Advantage: loading roms via firmware works also for devices which
are initialized after pc_init1(), i.e. everyting added via -device.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 8832cb805dcb65009b979cd8e17d75ac4b03c7e4)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/loader.c | 15 | ||||
| -rw-r--r-- | hw/loader.h | 2 | ||||
| -rw-r--r-- | hw/pc.c | 3 |
3 files changed, 7 insertions, 13 deletions
diff --git a/hw/loader.c b/hw/loader.c index 38ee2daf2a..b3bbd77d1e 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -535,6 +535,7 @@ struct Rom { QTAILQ_ENTRY(Rom) next; }; +static FWCfgState *fw_cfg; static QTAILQ_HEAD(, Rom) roms = QTAILQ_HEAD_INITIALIZER(roms); int rom_enable_driver_roms; @@ -592,6 +593,8 @@ int rom_add_file(const char *file, const char *fw_dir, } close(fd); rom_insert(rom); + if (rom->fw_file && fw_cfg) + fw_cfg_add_file(fw_cfg, rom->fw_dir, rom->fw_file, rom->data, rom->romsize); return 0; err: @@ -681,17 +684,9 @@ int rom_load_all(void) return 0; } -int rom_load_fw(void *fw_cfg) +void rom_set_fw(void *f) { - Rom *rom; - - QTAILQ_FOREACH(rom, &roms, next) { - if (!rom->fw_file) { - continue; - } - fw_cfg_add_file(fw_cfg, rom->fw_dir, rom->fw_file, rom->data, rom->romsize); - } - return 0; + fw_cfg = f; } static Rom *find_rom(target_phys_addr_t addr) diff --git a/hw/loader.h b/hw/loader.h index 698160b825..8ff3c94456 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -25,7 +25,7 @@ int rom_add_file(const char *file, const char *fw_dir, int rom_add_blob(const char *name, const void *blob, size_t len, target_phys_addr_t addr); int rom_load_all(void); -int rom_load_fw(void *fw_cfg); +void rom_set_fw(void *f); int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size); void *rom_ptr(target_phys_addr_t addr); void do_info_roms(Monitor *mon); @@ -1090,6 +1090,7 @@ static void pc_init1(ram_addr_t ram_size, bios_size, bios_offset | IO_MEM_ROM); fw_cfg = bochs_bios_init(); + rom_set_fw(fw_cfg); if (linux_boot) { load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size); @@ -1250,8 +1251,6 @@ static void pc_init1(ram_addr_t ram_size, } } } - - rom_load_fw(fw_cfg); } static void pc_init_pci(ram_addr_t ram_size, |