Avoid a bit of code duplication, make
max file path constant reusable.
Suggested-by: Laszlo Ersek <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
---
hw/core/loader.c | 2 +-
include/hw/nvram/fw_cfg.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index c3c28cf..c4dd665 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -645,7 +645,7 @@ int rom_add_file(const char *file, const char *fw_dir,
rom_insert(rom);
if (rom->fw_file && fw_cfg) {
const char *basename;
- char fw_file_name[56];
+ char fw_file_name[FW_CFG_MAX_FILE_PATH];
basename = strrchr(rom->fw_file, '/');
if (basename) {
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index f60dd67..fa5c8c6 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -46,12 +46,14 @@
#define FW_CFG_INVALID 0xffff
+#define FW_CFG_MAX_FILE_PATH 56
+
#ifndef NO_QEMU_PROTOS
typedef struct FWCfgFile {
uint32_t size; /* file size */
uint16_t select; /* write this to 0x510 to read it */
uint16_t reserved;
- char name[56];
+ char name[FW_CFG_MAX_FILE_PATH];
} FWCfgFile;
typedef struct FWCfgFiles {
--
MST
