Reviewed-by: Star Zeng <[email protected]> -----Original Message----- From: Ni, Ruiyu Sent: Monday, July 2, 2018 11:21 AM To: [email protected] Cc: Zeng, Star <[email protected]> Subject: [PATCH 1/3] MdeModulePkg/ResetUtilityLib: Add pack(1) for reset data structure
RESET_UTILITY_GUID_SPECIFIC_RESET_DATA structure should be declared as pack(1). The patch adds the missing pack(1) pragma. (GUID *)((UINT8 *)&ResetData + OFFSET_OF (RESET_UTILITY_GUID_SPECIFIC_RESET_DATA, ResetSubtype)) is used to replace &ResetData.ResetSubType to resolve C4366 VS compiler warning. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ruiyu Ni <[email protected]> Cc: Star Zeng <[email protected]> --- MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c index e3de4f117a..46a9ac6648 100644 --- a/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c +++ b/MdeModulePkg/Library/ResetUtilityLib/ResetUtility.c @@ -19,10 +19,14 @@ #include <Library/BaseMemoryLib.h> #include <Library/ResetSystemLib.h> +#pragma pack(1) typedef struct { CHAR16 NullTerminator; GUID ResetSubtype; } RESET_UTILITY_GUID_SPECIFIC_RESET_DATA; +#pragma pack() + +VERIFY_SIZE_OF (RESET_UTILITY_GUID_SPECIFIC_RESET_DATA, 18); /** This is a shorthand helper function to reset with a subtype so that @@ -49,7 +53,10 @@ ResetPlatformSpecificGuid ( RESET_UTILITY_GUID_SPECIFIC_RESET_DATA ResetData; ResetData.NullTerminator = CHAR_NULL; - CopyGuid (&ResetData.ResetSubtype, ResetSubtype); + CopyGuid ( + (GUID *)((UINT8 *)&ResetData + OFFSET_OF (RESET_UTILITY_GUID_SPECIFIC_RESET_DATA, ResetSubtype)), + ResetSubtype + ); ResetPlatformSpecific (sizeof (ResetData), &ResetData); } -- 2.16.1.windows.1 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
