Re: [Xen-devel] [PATCH] efi: Fix booting failure with UEFI on ARM

[Shannon Zhao <zhaoshenglong@xxxxxxxxxx>]

On 2015/11/10 18:45, Jan Beulich wrote:
>>>> On 10.11.15 at 08:55, <zhaoshenglong@xxxxxxxxxx> wrote:
>> --- a/xen/common/efi/boot.c
>> +++ b/xen/common/efi/boot.c
>> @@ -636,8 +636,8 @@ static void __init efi_console_set_mode(void)
>>  static EFI_GRAPHICS_OUTPUT_PROTOCOL __init *efi_get_gop(void)
>>  {
>>      EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info;
>> -    EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;
>> -    EFI_HANDLE *handles;
>> +    EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;
>> +    EFI_HANDLE *handles = NULL;
> 
> I can see the issue with handles being left uninitialized, but if you
> think gop also needs initializing, then I would have expected an
> explanation. The change is simple enough to take as is, but in the
> future please explain changes that aren't obviously needed.
> 
Yes, the root cause is the uninitialized handles not the uninitialized
gop. It just does what the original codes do before applying commit
9fd08b4.

@@ -738,14 +773,12 @@ void EFIAPI __init noreturn
 efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
 {
     static EFI_GUID __initdata loaded_image_guid = LOADED_IMAGE_PROTOCOL;
-    static EFI_GUID __initdata gop_guid =
EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
     static EFI_GUID __initdata shim_lock_guid = SHIM_LOCK_PROTOCOL_GUID;
     EFI_LOADED_IMAGE *loaded_image;
     EFI_STATUS status;
     unsigned int i, argc;
     CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL;
     UINTN map_key, info_size, gop_mode = ~0;
-    EFI_HANDLE *handles = NULL;
     EFI_SHIM_LOCK_PROTOCOL *shim_lock;
     EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL;

If you think it's not proper, I'll fix this.

Thanks,
-- 
Shannon


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel