[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] roms: use new fw_cfg file xfer support.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 5/8] roms: use new fw_cfg file xfer support. |
Date: |
Fri, 18 Dec 2009 12:01:11 +0100 |
roms: use fw_cfg for vgabios and option rom loading, additionally to
deploying them the traditional way (copy to 0xc0000 -> 0xe0000 range).
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/loader.c | 25 ++++++++++++++++++++++---
hw/loader.h | 5 +++--
hw/pc.c | 2 ++
3 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/hw/loader.c b/hw/loader.c
index 2d7a2c4..ccc0ccc 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -48,6 +48,7 @@
#include "sysemu.h"
#include "uboot_image.h"
#include "loader.h"
+#include "fw_cfg.h"
#include <zlib.h>
@@ -528,6 +529,8 @@ struct Rom {
uint8_t *data;
int align;
int isrom;
+ char *fw_dir;
+ char *fw_file;
target_phys_addr_t min;
target_phys_addr_t max;
@@ -556,7 +559,7 @@ static void rom_insert(Rom *rom)
QTAILQ_INSERT_TAIL(&roms, rom, next);
}
-int rom_add_file(const char *file,
+int rom_add_file(const char *file, const char *fw_dir, const char *fw_file,
target_phys_addr_t min, target_phys_addr_t max, int align)
{
Rom *rom;
@@ -576,6 +579,8 @@ int rom_add_file(const char *file,
goto err;
}
+ rom->fw_dir = fw_dir ? qemu_strdup(fw_dir) : NULL;
+ rom->fw_file = fw_file ? qemu_strdup(fw_file) : NULL;
rom->align = align;
rom->min = min;
rom->max = max;
@@ -623,14 +628,16 @@ int rom_add_vga(const char *file)
{
if (!rom_enable_driver_roms)
return 0;
- return rom_add_file(file, PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN);
+ return rom_add_file(file, "vgaroms", file,
+ PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN);
}
int rom_add_option(const char *file)
{
if (!rom_enable_driver_roms)
return 0;
- return rom_add_file(file, PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN);
+ return rom_add_file(file, "genroms", file,
+ PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN);
}
static void rom_reset(void *unused)
@@ -692,6 +699,18 @@ int rom_load_all(void)
return 0;
}
+int rom_load_fw(void *fw_cfg)
+{
+ 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;
+}
+
static Rom *find_rom(target_phys_addr_t addr)
{
Rom *rom;
diff --git a/hw/loader.h b/hw/loader.h
index b3311a3..634f7d5 100644
--- a/hw/loader.h
+++ b/hw/loader.h
@@ -19,17 +19,18 @@ void pstrcpy_targphys(const char *name,
target_phys_addr_t dest, int buf_size,
const char *source);
-int rom_add_file(const char *file,
+int rom_add_file(const char *file, const char *fw_dir, const char *fw_file,
target_phys_addr_t min, target_phys_addr_t max, int align);
int rom_add_blob(const char *name, const void *blob, size_t len,
target_phys_addr_t min, target_phys_addr_t max, int align);
int rom_load_all(void);
+int rom_load_fw(void *fw_cfg);
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);
#define rom_add_file_fixed(_f, _a) \
- rom_add_file(_f, _a, 0, 0)
+ rom_add_file(_f, NULL, NULL, _a, 0, 0)
#define rom_add_blob_fixed(_f, _b, _l, _a) \
rom_add_blob(_f, _b, _l, _a, 0, 0)
diff --git a/hw/pc.c b/hw/pc.c
index 147a9a7..be70f50 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1248,6 +1248,8 @@ static void pc_init1(ram_addr_t ram_size,
}
}
}
+
+ rom_load_fw(fw_cfg);
}
static void pc_init_pci(ram_addr_t ram_size,
--
1.6.5.2
[Qemu-devel] [PATCH 8/8] debug: enable bios messages, Gerd Hoffmann, 2009/12/18
[Qemu-devel] [PATCH 4/8] fw_cfg: add API for file transfer., Gerd Hoffmann, 2009/12/18
[Qemu-devel] [PATCH 6/8] roms: remove option rom packing logic, Gerd Hoffmann, 2009/12/18
[Qemu-devel] [PATCH 5/8] roms: use new fw_cfg file xfer support.,
Gerd Hoffmann <=
[Qemu-devel] [PATCH 2/8] pci romfiles: add property, add default to PCIDeviceInfo, Gerd Hoffmann, 2009/12/18
[Qemu-devel] [PATCH 7/8] updated seabios binary for testing convinience., Gerd Hoffmann, 2009/12/18
[Qemu-devel] Re: [SeaBIOS] [PATCH 0/8] option rom loading overhaul., Anthony Liguori, 2009/12/18
- [Qemu-devel] Re: [SeaBIOS] [PATCH 0/8] option rom loading overhaul., Gerd Hoffmann, 2009/12/18
- [Qemu-devel] Re: [SeaBIOS] [PATCH 0/8] option rom loading overhaul., Anthony Liguori, 2009/12/18
- [Qemu-devel] Re: [SeaBIOS] [PATCH 0/8] option rom loading overhaul., Gerd Hoffmann, 2009/12/18
- [Qemu-devel] Re: [SeaBIOS] [PATCH 0/8] option rom loading overhaul., Anthony Liguori, 2009/12/18
- Re: [Qemu-devel] Re: [SeaBIOS] [PATCH 0/8] option rom loading overhaul., Kevin O'Connor, 2009/12/18
- Re: [Qemu-devel] Re: [SeaBIOS] [PATCH 0/8] option rom loading overhaul., Anthony Liguori, 2009/12/18