svn commit: r320234 - head/sys/boot/efi/include

[Ed Maste]

On 22 June 2017 at 14:23, Dimitry Andric <dim at freebsd.org> wrote:
>> Modified: head/sys/boot/efi/include/efidef.h
>> ==============================================================================
>> --- head/sys/boot/efi/include/efidef.h        Thu Jun 22 13:31:44 2017        (r320233)
>> +++ head/sys/boot/efi/include/efidef.h        Thu Jun 22 14:30:09 2017        (r320234)
>> @@ -178,6 +178,7 @@ typedef enum {
>> #define EFI_MEMORY_DESCRIPTOR_VERSION  1
>> typedef struct {
>>     UINT32                          Type;           // Field size is 32 bits followed by 32 bit pad
>> +    UINT32                          Pad;
>>     EFI_PHYSICAL_ADDRESS            PhysicalStart;  // Field size is 64 bits
>>     EFI_VIRTUAL_ADDRESS             VirtualStart;   // Field size is 64 bits
>>     UINT64                          NumberOfPages;  // Field size is 64 bits
>
> If you explicitly insert padding, it is better to mark the struct as
> __packed, I think.  Or at least also specify the alignment explicitly.

Perhaps, although this struct now matches the definition in the edk
and u-boot EFI headers.