dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

efi_loader: return status from efi_setup_loaded_image()

Browse Source 
efi_setup_loaded_image() should return an error code indicating if
an error has occurred.

An error occurs if a protocol cannot be installed.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt
2017-12-04 18:03:01 +01:00
committed by Alexander Graf
parent 905cb9e172
commit 56d9288858
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/efi_loader.h
View File

@@ -249,9 +249,11 @@ uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type,
int efi_memory_init(void); int efi_memory_init(void);
/* Adds new or overrides configuration table entry to the system table */ /* Adds new or overrides configuration table entry to the system table */
efi_status_t efi_install_configuration_table(const efi_guid_t *guid, void *table); efi_status_t efi_install_configuration_table(const efi_guid_t *guid, void *table);
void efi_setup_loaded_image(struct efi_loaded_image *info, struct efi_object *obj, /* Sets up a loaded image */
struct efi_device_path *device_path, efi_status_t efi_setup_loaded_image(
struct efi_device_path *file_path); struct efi_loaded_image *info, struct efi_object *obj,
struct efi_device_path *device_path,
struct efi_device_path *file_path);
efi_status_t efi_load_image_from_path(struct efi_device_path *file_path, efi_status_t efi_load_image_from_path(struct efi_device_path *file_path,
void **buffer); void **buffer);

11
lib/efi_loader/efi_boottime.c
View File

@@ -1170,10 +1170,12 @@ static efi_status_t EFIAPI efi_install_configuration_table_ext(efi_guid_t *guid,
* @obj internal object associated with the loaded image * @obj internal object associated with the loaded image
* @device_path device path of the loaded image * @device_path device path of the loaded image
* @file_path file path of the loaded image * @file_path file path of the loaded image
* @return status code
*/ */
void efi_setup_loaded_image(struct efi_loaded_image *info, struct efi_object *obj, efi_status_t efi_setup_loaded_image(
struct efi_device_path *device_path, struct efi_loaded_image *info, struct efi_object *obj,
struct efi_device_path *file_path) struct efi_device_path *device_path,
struct efi_device_path *file_path)
{ {
efi_status_t ret; efi_status_t ret;
@@ -1213,9 +1215,10 @@ void efi_setup_loaded_image(struct efi_loaded_image *info, struct efi_object *ob
if (ret != EFI_SUCCESS) if (ret != EFI_SUCCESS)
goto failure; goto failure;
return; return ret;
failure: failure:
printf("ERROR: Failure to install protocols for loaded image\n"); printf("ERROR: Failure to install protocols for loaded image\n");
return ret;
} }
/* /*