update based on feedback

microsoft · Feb 26, 2024 · 9ca9c6a · 9ca9c6a
1 parent 90d3f69
commit 9ca9c6a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/AdvLoggerPkg/Include/Guid/AdvancedLoggerPreDxeLogs.h b/AdvLoggerPkg/Include/Guid/AdvancedLoggerPreDxeLogs.h
@@ -7,9 +7,10 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
-#ifndef __ADVANCED_LOGGER_PRE_DXE_LOGS_H__
-#define __ADVANCED_LOGGER_PRE_DXE_LOGS_H__
+#ifndef ADVANCED_LOGGER_PRE_DXE_LOGS_H_
+#define ADVANCED_LOGGER_PRE_DXE_LOGS_H_
 
+#pragma pack(1)
 // The region specified by this HOB entry should contain raw log output.
 // The Advanced Logger library will serialize the contents of the buffer
 // when adding it to the advanced logger output.
@@ -18,6 +19,7 @@ typedef struct _ADVANCED_LOGGER_PRE_DXE_LOGS_HOB {
   UINT64    BaseAddress;
   UINT64    LengthInBytes;
 } ADVANCED_LOGGER_PRE_DXE_LOGS_HOB;
+#pragma pack()
 
 #define ADVANCED_LOGGER_PRE_DXE_LOGS_GUID \
 { \

diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/DxeCore/AdvancedLoggerLib.c b/AdvLoggerPkg/Library/AdvancedLoggerLib/DxeCore/AdvancedLoggerLib.c
@@ -368,7 +368,7 @@ DxeCoreAdvancedLoggerLibConstructor (
 {
   ADVANCED_LOGGER_INFO              *LoggerInfo;
   EFI_STATUS                        Status;
-  ADVANCED_LOGGER_PRE_DXE_LOGS_HOB  PreDxeLogs;
+  ADVANCED_LOGGER_PRE_DXE_LOGS_HOB  *PreDxeLogs;
   EFI_HOB_GUID_TYPE                 *PreDxeLogsHobEntry;
 
   LoggerInfo = AdvancedLoggerGetLoggerInfo ();      // Sets mLoggerInfo if Logger Information block found in HOB.
@@ -407,11 +407,11 @@ DxeCoreAdvancedLoggerLibConstructor (
     PreDxeLogsHobEntry = GetFirstGuidHob (&gAdvancedLoggerPreDxeLogsGuid);
 
     if (PreDxeLogsHobEntry != NULL) {
-      PreDxeLogs = *(ADVANCED_LOGGER_PRE_DXE_LOGS_HOB *)GET_GUID_HOB_DATA (PreDxeLogsHobEntry);
-      if (PreDxeLogs.Signature != ADVANCED_LOGGER_PRE_DXE_LOGS_SIGNATURE) {
-        ASSERT (PreDxeLogs.Signature == ADVANCED_LOGGER_PRE_DXE_LOGS_SIGNATURE);
+      PreDxeLogs = (ADVANCED_LOGGER_PRE_DXE_LOGS_HOB *)GET_GUID_HOB_DATA (PreDxeLogsHobEntry);
+      if (PreDxeLogs->Signature != ADVANCED_LOGGER_PRE_DXE_LOGS_SIGNATURE) {
+        ASSERT (PreDxeLogs->Signature == ADVANCED_LOGGER_PRE_DXE_LOGS_SIGNATURE);
       } else {
-        AdvancedLoggerMemoryLoggerWrite (DEBUG_INFO, (CONST CHAR8 *)(UINTN)PreDxeLogs.BaseAddress, PreDxeLogs.LengthInBytes);
+        AdvancedLoggerMemoryLoggerWrite (DEBUG_INFO, (CONST CHAR8 *)(UINTN)PreDxeLogs->BaseAddress, PreDxeLogs->LengthInBytes);
       }
     }