efi_loader: avoid using HandleProtocol in helloworld.efi

HandleProtocol() is deprecated and leaves an OpenedProtocolInformation
behind. Use OpenProtocol(GET_PROTOCOL) instead.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/lib/efi_loader/helloworld.c b/lib/efi_loader/helloworld.c
index 49fa8cc2f00f946359a54d0435450065fe07ec1e..6405f58ec3fb0d2c033f94d51a36174331d4df86 100644 (file)
--- a/lib/efi_loader/helloworld.c
+++ b/lib/efi_loader/helloworld.c
@@ -197,8 +197,10 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,
        print_config_tables();
 
        /* Get the loaded image protocol */
-       ret = boottime->handle_protocol(handle, &loaded_image_guid,
-                                       (void **)&loaded_image);
+       ret = boottime->open_protocol(handle, &loaded_image_guid,
+                                     (void **)&loaded_image, NULL, NULL,
+                                     EFI_OPEN_PROTOCOL_GET_PROTOCOL);
+
        if (ret != EFI_SUCCESS) {
                con_out->output_string
                        (con_out, u"Cannot open loaded image protocol\r\n");
@@ -219,9 +221,10 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,
                        (con_out, u"Missing device handle\r\n");
                goto out;
        }
-       ret = boottime->handle_protocol(loaded_image->device_handle,
-                                       &device_path_guid,
-                                       (void **)&device_path);
+       ret = boottime->open_protocol(loaded_image->device_handle,
+                                     &device_path_guid,
+                                     (void **)&device_path, NULL, NULL,
+                                     EFI_OPEN_PROTOCOL_GET_PROTOCOL);
        if (ret != EFI_SUCCESS) {
                con_out->output_string
                        (con_out, u"Missing device path for device handle\r\n");