[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/43] loader: use file path size from fw_cfg.h
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 26/43] loader: use file path size from fw_cfg.h |
Date: |
Mon, 14 Oct 2013 17:59:37 +0300 |
Avoid a bit of code duplication, make
max file path constant reusable.
Suggested-by: Laszlo Ersek <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Tested-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/nvram/fw_cfg.h | 4 +++-
hw/core/loader.c | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index 2ab0fc2..72b1549 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 {
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 449bd4c..060729f 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -663,7 +663,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];
void *data;
basename = strrchr(rom->fw_file, '/');
--
MST
- [Qemu-devel] [PULL 15/43] pci: fix up w64 size calculation helper, (continued)
- [Qemu-devel] [PULL 15/43] pci: fix up w64 size calculation helper, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 16/43] fw_cfg: interface to trigger callback on read, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 17/43] loader: support for unmapped ROM blobs, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 18/43] pcie_host: expose UNMAPPED macro, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 19/43] pcie_host: expose address format, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 20/43] q35: use macro for MCFG property name, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 21/43] q35: expose mmcfg size as a property, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 23/43] acpi: add rules to compile ASL source, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 25/43] acpi: ssdt pcihp: updat generated file, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 22/43] i386: add ACPI table files from seabios, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 26/43] loader: use file path size from fw_cfg.h,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 24/43] acpi: pre-compiled ASL files, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 27/43] i386: add bios linker/loader, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 28/43] loader: allow adding ROMs in done callbacks, Michael S. Tsirkin, 2013/10/14
- Re: [Qemu-devel] [PULL 00/43] pci, pc, acpi fixes, enhancements, Paolo Bonzini, 2013/10/14
- [Qemu-devel] [PULL 29/43] i386: define pc guest info, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 30/43] acpi/piix: add macros for acpi property names, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 31/43] piix: APIs for pc guest info, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 32/43] ich9: APIs for pc guest info, Michael S. Tsirkin, 2013/10/14