LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_loader: use const efi_guid_t * for variable services 

The runtime variable services never change GUIDs. So we should declare
the GUID parameters as constant.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2018-12-30 20:53:51 +01:00 committed by Alexander Graf
parent 056b45bc50
commit 0bda81bfdc
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/efi_api.h
View File

@ -221,13 +221,15 @@ struct efi_runtime_services {
struct efi_mem_desc *virtmap); struct efi_mem_desc *virtmap);
efi_status_t (*convert_pointer)(unsigned long dbg, void **address); efi_status_t (*convert_pointer)(unsigned long dbg, void **address);
efi_status_t (EFIAPI *get_variable)(u16 *variable_name, efi_status_t (EFIAPI *get_variable)(u16 *variable_name,
efi_guid_t *vendor, u32 *attributes, const efi_guid_t *vendor,
u32 *attributes,
efi_uintn_t *data_size, void *data); efi_uintn_t *data_size, void *data);
efi_status_t (EFIAPI *get_next_variable_name)( efi_status_t (EFIAPI *get_next_variable_name)(
efi_uintn_t *variable_name_size, efi_uintn_t *variable_name_size,
u16 *variable_name, efi_guid_t *vendor); u16 *variable_name, const efi_guid_t *vendor);
efi_status_t (EFIAPI *set_variable)(u16 *variable_name, efi_status_t (EFIAPI *set_variable)(u16 *variable_name,
efi_guid_t *vendor, u32 attributes, const efi_guid_t *vendor,
u32 attributes,
efi_uintn_t data_size, void *data); efi_uintn_t data_size, void *data);
efi_status_t (EFIAPI *get_next_high_mono_count)( efi_status_t (EFIAPI *get_next_high_mono_count)(
uint32_t *high_count); uint32_t *high_count);

14
include/efi_loader.h
View File

@ -510,15 +510,15 @@ efi_status_t EFIAPI efi_selftest(efi_handle_t image_handle,
struct efi_system_table *systab); struct efi_system_table *systab);
#endif #endif
efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor, efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
u32 *attributes, efi_uintn_t *data_size, const efi_guid_t *vendor, u32 *attributes,
void *data); efi_uintn_t *data_size, void *data);
efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size, efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
u16 *variable_name, u16 *variable_name,
efi_guid_t *vendor); const efi_guid_t *vendor);
efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor, efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
u32 attributes, efi_uintn_t data_size, const efi_guid_t *vendor, u32 attributes,
void *data); efi_uintn_t data_size, void *data);
/* /*
* See section 3.1.3 in the v2.7 UEFI spec for more details on * See section 3.1.3 in the v2.7 UEFI spec for more details on

16
lib/efi_loader/efi_variable.c
View File

@ -99,7 +99,7 @@ static char *mem2hex(char *hexstr, const u8 *mem, int count)
} }
static efi_status_t efi_to_native(char **native, const u16 *variable_name, static efi_status_t efi_to_native(char **native, const u16 *variable_name,
efi_guid_t *vendor) const efi_guid_t *vendor)
{ {
size_t len; size_t len;
char *pos; char *pos;
@ -163,9 +163,9 @@ static const char *parse_attr(const char *str, u32 *attrp)
} }
/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetVariable.28.29 */ /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetVariable.28.29 */
efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor, efi_status_t EFIAPI efi_get_variable(u16 *variable_name,
u32 *attributes, efi_uintn_t *data_size, const efi_guid_t *vendor, u32 *attributes,
void *data) efi_uintn_t *data_size, void *data)
{ {
char *native_name; char *native_name;
efi_status_t ret; efi_status_t ret;
@ -244,7 +244,7 @@ efi_status_t EFIAPI efi_get_variable(u16 *variable_name, efi_guid_t *vendor,
/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetNextVariableName.28.29 */ /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#GetNextVariableName.28.29 */
efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size, efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
u16 *variable_name, u16 *variable_name,
efi_guid_t *vendor) const efi_guid_t *vendor)
{ {
EFI_ENTRY("%p \"%ls\" %pUl", variable_name_size, variable_name, vendor); EFI_ENTRY("%p \"%ls\" %pUl", variable_name_size, variable_name, vendor);
@ -252,9 +252,9 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
} }
/* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#SetVariable.28.29 */ /* http://wiki.phoenix.com/wiki/index.php/EFI_RUNTIME_SERVICES#SetVariable.28.29 */
efi_status_t EFIAPI efi_set_variable(u16 *variable_name, efi_guid_t *vendor, efi_status_t EFIAPI efi_set_variable(u16 *variable_name,
u32 attributes, efi_uintn_t data_size, const efi_guid_t *vendor, u32 attributes,
void *data) efi_uintn_t data_size, void *data)
{ {
char *native_name = NULL, *val = NULL, *s; char *native_name = NULL, *val = NULL, *s;
efi_status_t ret = EFI_SUCCESS; efi_status_t ret = EFI_SUCCESS;

4
lib/efi_selftest/efi_selftest_variables.c
View File

@ -15,10 +15,10 @@
static struct efi_boot_services *boottime; static struct efi_boot_services *boottime;
static struct efi_runtime_services *runtime; static struct efi_runtime_services *runtime;
static efi_guid_t guid_vendor0 = static const efi_guid_t guid_vendor0 =
EFI_GUID(0x67029eb5, 0x0af2, 0xf6b1, EFI_GUID(0x67029eb5, 0x0af2, 0xf6b1,
0xda, 0x53, 0xfc, 0xb5, 0x66, 0xdd, 0x1c, 0xe6); 0xda, 0x53, 0xfc, 0xb5, 0x66, 0xdd, 0x1c, 0xe6);
static efi_guid_t guid_vendor1 = static const efi_guid_t guid_vendor1 =
EFI_GUID(0xff629290, 0x1fc1, 0xd73f, EFI_GUID(0xff629290, 0x1fc1, 0xd73f,
0x8f, 0xb1, 0x32, 0xf9, 0x0c, 0xa0, 0x42, 0xea); 0x8f, 0xb1, 0x32, 0xf9, 0x0c, 0xa0, 0x42, 0xea);