[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv4 12/15] Change fw_cfg_add_file() to get full file p
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCHv4 12/15] Change fw_cfg_add_file() to get full file path as a parameter. |
Date: |
Sun, 14 Nov 2010 17:39:38 +0200 |
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 <address@hidden>
---
hw/fw_cfg.c | 16 ++++------------
hw/fw_cfg.h | 4 ++--
hw/loader.c | 16 ++++++++++++++--
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 72866ae..7b9434f 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -277,10 +277,9 @@ int fw_cfg_add_callback(FWCfgState *s, uint16_t key,
FWCfgCallback callback,
return 1;
}
-int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename,
- uint8_t *data, uint32_t len)
+int fw_cfg_add_file(FWCfgState *s, const char *filename, uint8_t *data,
+ uint32_t len)
{
- const char *basename;
int i, index;
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);
- basename = strrchr(filename, '/');
- if (basename) {
- basename++;
- } else {
- basename = filename;
- }
-
- snprintf(s->files->f[index].name, sizeof(s->files->f[index].name),
- "%s/%s", dir, basename);
+ pstrcpy(s->files->f[index].name, sizeof(s->files->f[index].name),
+ filename);
for (i = 0; i < index; i++) {
if (strcmp(s->files->f[index].name, s->files->f[i].name) == 0) {
FW_CFG_DPRINTF("%s: skip duplicate: %s\n", __FUNCTION__,
diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h
index 4d13a4f..856bf91 100644
--- a/hw/fw_cfg.h
+++ b/hw/fw_cfg.h
@@ -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_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback,
void *callback_opaque, uint8_t *data, size_t len);
-int fw_cfg_add_file(FWCfgState *s, const char *dir, const char *filename,
- uint8_t *data, uint32_t len);
+int fw_cfg_add_file(FWCfgState *s, const char *filename, uint8_t *data,
+ uint32_t len);
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
target_phys_addr_t crl_addr, target_phys_addr_t
data_addr);
diff --git a/hw/loader.c b/hw/loader.c
index 49ac1fa..1e98326 100644
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -592,8 +592,20 @@ 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);
+ if (rom->fw_file && fw_cfg) {
+ 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;
err:
--
1.7.1
- [Qemu-devel] [PATCHv4 00/15] boot order specification, Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 02/15] Introduce new BusInfo callback get_fw_dev_path., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 04/15] Add get_fw_dev_path callback to ISA bus in qdev., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 12/15] Change fw_cfg_add_file() to get full file path as a parameter.,
Gleb Natapov <=
- [Qemu-devel] [PATCHv4 05/15] Store IDE bus id in IDEBus structure for easy access., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 09/15] Record which USBDevice USBPort belongs too., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 07/15] Add get_dev_path callback for system bus., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 03/15] Keep track of ISA ports ISA device is using in qdev., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 08/15] Add get_fw_dev_path callback for pci bus., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 10/15] Add get_dev_path callback for usb bus., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 01/15] Introduce fw_name field to DeviceInfo structure., Gleb Natapov, 2010/11/14
- [Qemu-devel] [PATCHv4 06/15] Add get_fw_dev_path callback to IDE bus., Gleb Natapov, 2010/11/14