From 6a904296e42ea6b8c27a489db049aef05db629c2 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 19 Jun 2014 06:13:01 +0000 Subject: [PATCH] OvmgPkg: QemuFwCfgLib: export QEMU_FW_CFG_FNAME_SIZE Names of firmware configuration files always take 56 bytes (including at least one terminating NUL byte). Expose this constant to all consumers of QemuFwCfgLib because further interfaces may depend on it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15571 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/Include/Library/QemuFwCfgLib.h | 6 ++++++ OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Include/Library/QemuFwCfgLib.h b/OvmfPkg/Include/Library/QemuFwCfgLib.h index 8d3b835d43..baaa257d61 100644 --- a/OvmfPkg/Include/Library/QemuFwCfgLib.h +++ b/OvmfPkg/Include/Library/QemuFwCfgLib.h @@ -17,6 +17,12 @@ #ifndef __FW_CFG_LIB__ #define __FW_CFG_LIB__ +// +// The size, in bytes, of names of firmware configuration files, including at +// least one terminating NUL byte. +// +#define QEMU_FW_CFG_FNAME_SIZE 56 + typedef enum { QemuFwCfgItemSignature = 0x0000, QemuFwCfgItemInterfaceVersion = 0x0001, diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c index 92c85c1d3d..24424f83a9 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c @@ -278,7 +278,7 @@ QemuFwCfgFindFile ( UINT32 FileSize; UINT16 FileSelect; UINT16 FileReserved; - CHAR8 FName[56]; + CHAR8 FName[QEMU_FW_CFG_FNAME_SIZE]; FileSize = QemuFwCfgRead32 (); FileSelect = QemuFwCfgRead16 ();