[efi] Prefer driver name to device path for debug messages

The driver name is usually more informative for debug messages than
the device path from which a driver was loaded.  Try using the various
mechanisms for obtaining a driver name before trying the device path.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/interface/efi/efi_debug.c b/src/interface/efi/efi_debug.c
index 1b778805e316bc32fbadc0a29f52712f5523ae02..9e28067de1d21bbe117d9cb6e68a2632d84bb46e 100644 (file)
--- a/src/interface/efi/efi_debug.c
+++ b/src/interface/efi/efi_debug.c
@@ -623,9 +623,6 @@ struct efi_handle_name_type {
 
 /** EFI handle name types */
 static struct efi_handle_name_type efi_handle_name_types[] = {
-       /* Device path */
-       EFI_HANDLE_NAME_TYPE ( &efi_device_path_protocol_guid,
-                              efi_devpath_text ),
        /* Driver name (for driver image handles) */
        EFI_HANDLE_NAME_TYPE ( &efi_component_name2_protocol_guid,
                               efi_driver_name2 ),
@@ -650,6 +647,9 @@ static struct efi_handle_name_type efi_handle_name_types[] = {
        /* Handle's loaded image file path (for image handles) */
        EFI_HANDLE_NAME_TYPE ( &efi_loaded_image_protocol_guid,
                               efi_loaded_image_filepath_name ),
+       /* Device path */
+       EFI_HANDLE_NAME_TYPE ( &efi_device_path_protocol_guid,
+                              efi_devpath_text ),
        /* Our standard input file handle */
        EFI_HANDLE_NAME_TYPE ( &efi_simple_text_input_protocol_guid,
                               efi_conin_name ),