diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-05-01 14:20:18 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-05-07 21:10:03 +0200 |
| commit | cd73aba656b19d795eaf5756d5d4815d299cf07f (patch) | |
| tree | 68e6574bec1cf2288e75e698e4599693e338425b | |
| parent | 8dfb5e6e211fb9d6e1c6650617377a99342224ae (diff) | |
| download | u-boot-cd73aba656b19d795eaf5756d5d4815d299cf07f.tar.gz u-boot-cd73aba656b19d795eaf5756d5d4815d299cf07f.tar.xz u-boot-cd73aba656b19d795eaf5756d5d4815d299cf07f.zip | |
efi_loader: mark started images
In UnloadImage() we need to know if an image is already started.
Add a field to the handle structure identifying loaded and started images.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| -rw-r--r-- | include/efi_loader.h | 13 | ||||
| -rw-r--r-- | lib/efi_loader/efi_boottime.c | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index 7af3f16ef8..3b50cd28ef 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -180,6 +180,18 @@ struct efi_handler { }; /** + * enum efi_object_type - type of EFI object + * + * In UnloadImage we must be able to identify if the handle relates to a + * started image. + */ +enum efi_object_type { + EFI_OBJECT_TYPE_UNDEFINED = 0, + EFI_OBJECT_TYPE_LOADED_IMAGE, + EFI_OBJECT_TYPE_STARTED_IMAGE, +}; + +/** * struct efi_object - dereferenced EFI handle * * @link: pointers to put the handle into a linked list @@ -201,6 +213,7 @@ struct efi_object { struct list_head link; /* The list of protocols */ struct list_head protocols; + enum efi_object_type type; }; /** diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 0c92cc1807..45e4d98708 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1554,6 +1554,7 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path, free(info); return EFI_OUT_OF_RESOURCES; } + obj->header.type = EFI_OBJECT_TYPE_LOADED_IMAGE; /* Add internal object to object list */ efi_add_handle(&obj->header); @@ -2678,6 +2679,7 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, } current_image = image_handle; + image_obj->header.type = EFI_OBJECT_TYPE_STARTED_IMAGE; EFI_PRINT("Jumping into 0x%p\n", image_obj->entry); ret = EFI_CALL(image_obj->entry(image_handle, &systab)); |