[efi] Show more diagnostic information when building with DEBUG=efi_wrap

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 611f46cefad676d4f63e5e1d526c24751b664550..b7a786bfd10c2c67367960177c17f9613e175672 100644 (file)
--- a/src/interface/efi/efi_debug.c
+++ b/src/interface/efi/efi_debug.c
@@ -61,6 +61,7 @@ static struct efi_well_known_guid efi_well_known_guids[] = {
        { EFI_DISK_IO_PROTOCOL_GUID,            "DiskIo" },
        { EFI_DEVICE_PATH_PROTOCOL_GUID,        "DevicePath" },
        { EFI_LOADED_IMAGE_PROTOCOL_GUID,       "LoadedImage" },
+       { EFI_LOADED_IMAGE_DEVICE_PATH_PROTOCOL_GUID, "LoadedImageDevicePath" },
        { EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID, "SimpleFileSystem" },
        { EFI_SIMPLE_NETWORK_PROTOCOL_GUID,     "SimpleNetwork" },
 };

diff --git a/src/interface/efi/efi_wrap.c b/src/interface/efi/efi_wrap.c
index 7a9e48ccc9a6f2cfa6fcfadf7dae19710219a147..b9b301184551e4e28f8c13cdf9fbe4795e24ab85 100644 (file)
--- a/src/interface/efi/efi_wrap.c
+++ b/src/interface/efi/efi_wrap.c
@@ -227,11 +227,13 @@ void efi_wrap ( EFI_HANDLE handle, EFI_LOADED_IMAGE_PROTOCOL *loaded ) {
 
        /* Provide system table wrapper to image */
        loaded->SystemTable = &efi_systab_wrapper;
-       DBGC ( colour, "Wrapped image %p %s at base %p\n", handle,
-              efi_handle_devpath_text ( handle ), loaded->ImageBase );
+       DBGC ( colour, "Wrapped image %p %s at base %p has protocols:\n",
+              handle, efi_handle_devpath_text ( handle ), loaded->ImageBase );
+       DBGC_EFI_PROTOCOLS ( colour, handle );
        DBGC ( colour, "Parent image %p %s\n", loaded->ParentHandle,
               efi_handle_devpath_text ( loaded->ParentHandle ) );
        DBGC ( colour, "Device %p %s ", loaded->DeviceHandle,
               efi_handle_devpath_text ( loaded->DeviceHandle ) );
-       DBGC ( colour, "file %s\n", efi_devpath_text ( loaded->FilePath ) );
+       DBGC ( colour, "file %p %s\n", loaded->FilePath,
+              efi_devpath_text ( loaded->FilePath ) );
 }