ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

roms: minor fixes and cleanups. 

Changes:
  - Drop extra file argument from rom_add_file().
  - Drop fw_dir check in do_info_roms, we allways have a dir name.
  - code style fixes.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2010-01-08 15:25:38 +01:00 committed by Anthony Liguori
parent 2cae6f5e34
commit bdb5ee3064
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/loader.c
View File

@ -556,7 +556,7 @@ static void rom_insert(Rom *rom)
QTAILQ_INSERT_TAIL(&roms, rom, next); QTAILQ_INSERT_TAIL(&roms, rom, next);
} }
int rom_add_file(const char *file, const char *fw_dir, const char *fw_file, int rom_add_file(const char *file, const char *fw_dir,
target_phys_addr_t addr) target_phys_addr_t addr)
{ {
Rom *rom; Rom *rom;
@ -576,8 +576,10 @@ int rom_add_file(const char *file, const char *fw_dir, const char *fw_file,
goto err; goto err;
} }
rom->fw_dir = fw_dir ? qemu_strdup(fw_dir) : NULL; if (fw_dir) {
rom->fw_file = fw_file ? qemu_strdup(fw_file) : NULL; rom->fw_dir = qemu_strdup(fw_dir);
rom->fw_file = qemu_strdup(file);
}
rom->addr = addr; rom->addr = addr;
rom->romsize = lseek(fd, 0, SEEK_END); rom->romsize = lseek(fd, 0, SEEK_END);
rom->data = qemu_mallocz(rom->romsize); rom->data = qemu_mallocz(rom->romsize);
@ -621,14 +623,14 @@ int rom_add_vga(const char *file)
{ {
if (!rom_enable_driver_roms) if (!rom_enable_driver_roms)
return 0; return 0;
return rom_add_file(file, "vgaroms", file, 0); return rom_add_file(file, "vgaroms", 0);
} }
int rom_add_option(const char *file) int rom_add_option(const char *file)
{ {
if (!rom_enable_driver_roms) if (!rom_enable_driver_roms)
return 0; return 0;
return rom_add_file(file, "genroms", file, 0); return rom_add_file(file, "genroms", 0);
} }
static void rom_reset(void *unused) static void rom_reset(void *unused)
@ -639,8 +641,9 @@ static void rom_reset(void *unused)
if (rom->fw_file) { if (rom->fw_file) {
continue; continue;
} }
if (rom->data == NULL) if (rom->data == NULL) {
continue; continue;
}
cpu_physical_memory_write_rom(rom->addr, rom->data, rom->romsize); cpu_physical_memory_write_rom(rom->addr, rom->data, rom->romsize);
if (rom->isrom) { if (rom->isrom) {
/* rom needs to be written only once */ /* rom needs to be written only once */
@ -683,8 +686,9 @@ int rom_load_fw(void *fw_cfg)
Rom *rom; Rom *rom;
QTAILQ_FOREACH(rom, &roms, next) { QTAILQ_FOREACH(rom, &roms, next) {
if (!rom->fw_file) if (!rom->fw_file) {
continue; continue;
}
fw_cfg_add_file(fw_cfg, rom->fw_dir, rom->fw_file, rom->data, rom->romsize); fw_cfg_add_file(fw_cfg, rom->fw_dir, rom->fw_file, rom->data, rom->romsize);
} }
return 0; return 0;
@ -698,10 +702,12 @@ static Rom *find_rom(target_phys_addr_t addr)
if (rom->fw_file) { if (rom->fw_file) {
continue; continue;
} }
if (rom->addr > addr) if (rom->addr > addr) {
continue; continue;
if (rom->addr + rom->romsize < addr) }
if (rom->addr + rom->romsize < addr) {
continue; continue;
}
return rom; return rom;
} }
return NULL; return NULL;
@ -723,12 +729,15 @@ int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size)
if (rom->fw_file) { if (rom->fw_file) {
continue; continue;
} }
if (rom->addr + rom->romsize < addr) if (rom->addr + rom->romsize < addr) {
continue; continue;
if (rom->addr > end) }
if (rom->addr > end) {
break; break;
if (!rom->data) }
if (!rom->data) {
continue; continue;
}
d = dest + (rom->addr - addr); d = dest + (rom->addr - addr);
s = rom->data; s = rom->data;
@ -771,10 +780,9 @@ void do_info_roms(Monitor *mon)
rom->isrom ? "rom" : "ram", rom->isrom ? "rom" : "ram",
rom->name); rom->name);
} else { } else {
monitor_printf(mon, "fw=%s%s%s" monitor_printf(mon, "fw=%s/%s"
" size=0x%06zx name=\"%s\" \n", " size=0x%06zx name=\"%s\" \n",
rom->fw_dir ? rom->fw_dir : "", rom->fw_dir,
rom->fw_dir ? "/" : "",
rom->fw_file, rom->fw_file,
rom->romsize, rom->romsize,
rom->name); rom->name);

5
hw/loader.h
View File

@ -19,7 +19,8 @@ void pstrcpy_targphys(const char *name,
target_phys_addr_t dest, int buf_size, target_phys_addr_t dest, int buf_size,
const char *source); const char *source);
int rom_add_file(const char *file, const char *fw_dir, const char *fw_file,
int rom_add_file(const char *file, const char *fw_dir,
target_phys_addr_t addr); target_phys_addr_t addr);
int rom_add_blob(const char *name, const void *blob, size_t len, int rom_add_blob(const char *name, const void *blob, size_t len,
target_phys_addr_t addr); target_phys_addr_t addr);
@ -30,7 +31,7 @@ void *rom_ptr(target_phys_addr_t addr);
void do_info_roms(Monitor *mon); void do_info_roms(Monitor *mon);
#define rom_add_file_fixed(_f, _a) \ #define rom_add_file_fixed(_f, _a) \
rom_add_file(_f, NULL, NULL, _a) rom_add_file(_f, NULL, _a)
#define rom_add_blob_fixed(_f, _b, _l, _a) \ #define rom_add_blob_fixed(_f, _b, _l, _a) \
rom_add_blob(_f, _b, _l, _a) rom_add_blob(_f, _b, _l, _a)