Change fw_cfg_add_file() to get full file path as a parameter.
Change fw_cfg_add_file() to get full file path as a parameter instead of building one internally. Two reasons for that. First caller may need to know how file is named. Second this moves policy of file naming out from fw_cfg. Platform may want to use more then two levels of directories for instance. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
1ca4d09ae0
commit
de1f34cb63
16
hw/fw_cfg.c
16
hw/fw_cfg.c
|
@ -277,10 +277,9 @@ int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename,
|
int fw_cfg_add_file(FWCfgState *s, const char *filename, uint8_t *data,
|
||||||
uint8_t *data, uint32_t len)
|
uint32_t len)
|
||||||
{
|
{
|
||||||
const char *basename;
|
|
||||||
int i, index;
|
int i, index;
|
||||||
|
|
||||||
if (!s->files) {
|
if (!s->files) {
|
||||||
|
@ -297,15 +296,8 @@ int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename,
|
||||||
|
|
||||||
fw_cfg_add_bytes(s, FW_CFG_FILE_FIRST + index, data, len);
|
fw_cfg_add_bytes(s, FW_CFG_FILE_FIRST + index, data, len);
|
||||||
|
|
||||||
basename = strrchr(filename, '/');
|
pstrcpy(s->files->f[index].name, sizeof(s->files->f[index].name),
|
||||||
if (basename) {
|
filename);
|
||||||
basename++;
|
|
||||||
} else {
|
|
||||||
basename = filename;
|
|
||||||
}
|
|
||||||
|
|
||||||
snprintf(s->files->f[index].name, sizeof(s->files->f[index].name),
|
|
||||||
"%s/%s", dir, basename);
|
|
||||||
for (i = 0; i < index; i++) {
|
for (i = 0; i < index; i++) {
|
||||||
if (strcmp(s->files->f[index].name, s->files->f[i].name) == 0) {
|
if (strcmp(s->files->f[index].name, s->files->f[i].name) == 0) {
|
||||||
FW_CFG_DPRINTF("%s: skip duplicate: %s\n", __FUNCTION__,
|
FW_CFG_DPRINTF("%s: skip duplicate: %s\n", __FUNCTION__,
|
||||||
|
|
|
@ -60,8 +60,8 @@ int fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value);
|
||||||
int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value);
|
int fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value);
|
||||||
int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback,
|
int fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback,
|
||||||
void *callback_opaque, uint8_t *data, size_t len);
|
void *callback_opaque, uint8_t *data, size_t len);
|
||||||
int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename,
|
int fw_cfg_add_file(FWCfgState *s, const char *filename, uint8_t *data,
|
||||||
uint8_t *data, uint32_t len);
|
uint32_t len);
|
||||||
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
|
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
|
||||||
target_phys_addr_t crl_addr, target_phys_addr_t data_addr);
|
target_phys_addr_t crl_addr, target_phys_addr_t data_addr);
|
||||||
|
|
||||||
|
|
16
hw/loader.c
16
hw/loader.c
|
@ -592,8 +592,20 @@ int rom_add_file(const char *file, const char *fw_dir,
|
||||||
}
|
}
|
||||||
close(fd);
|
close(fd);
|
||||||
rom_insert(rom);
|
rom_insert(rom);
|
||||||
if (rom->fw_file && fw_cfg)
|
if (rom->fw_file && fw_cfg) {
|
||||||
fw_cfg_add_file(fw_cfg, rom->fw_dir, rom->fw_file, rom->data, rom->romsize);
|
const char *basename;
|
||||||
|
char fw_file_name[56];
|
||||||
|
|
||||||
|
basename = strrchr(rom->fw_file, '/');
|
||||||
|
if (basename) {
|
||||||
|
basename++;
|
||||||
|
} else {
|
||||||
|
basename = rom->fw_file;
|
||||||
|
}
|
||||||
|
snprintf(fw_file_name, sizeof(fw_file_name), "%s/%s", rom->fw_dir,
|
||||||
|
basename);
|
||||||
|
fw_cfg_add_file(fw_cfg, fw_file_name, rom->data, rom->romsize);
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err:
|
err:
|
||||||
|
|
Loading…
Reference in New Issue