// blobs under processing.\r
//\r
typedef struct {\r
- UINT8 File[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated name of the fw_cfg\r
- // blob. This is the ordering / search\r
- // key.\r
- UINTN Size; // The number of bytes in this blob.\r
- UINT8 *Base; // Pointer to the blob data.\r
- BOOLEAN HostsOnlyTableData; // TRUE iff the blob has been found to\r
- // only contain data that is directly\r
- // part of ACPI tables.\r
+ UINT8 File[QEMU_LOADER_FNAME_SIZE]; // NUL-terminated name of the fw_cfg\r
+ // blob. This is the ordering / search\r
+ // key.\r
+ UINTN Size; // The number of bytes in this blob.\r
+ UINT8 *Base; // Pointer to the blob data.\r
+ BOOLEAN HostsOnlyTableData; // TRUE iff the blob has been found to\r
+ // only contain data that is directly\r
+ // part of ACPI tables.\r
} BLOB;\r
\r
-\r
/**\r
Compare a standalone key against a user structure containing an embedded key.\r
\r
INTN\r
EFIAPI\r
BlobKeyCompare (\r
- IN CONST VOID *StandaloneKey,\r
- IN CONST VOID *UserStruct\r
+ IN CONST VOID *StandaloneKey,\r
+ IN CONST VOID *UserStruct\r
)\r
{\r
- CONST BLOB *Blob;\r
+ CONST BLOB *Blob;\r
\r
Blob = UserStruct;\r
return AsciiStrCmp (StandaloneKey, (CONST CHAR8 *)Blob->File);\r
}\r
\r
-\r
/**\r
Comparator function for two user structures.\r
\r
INTN\r
EFIAPI\r
BlobCompare (\r
- IN CONST VOID *UserStruct1,\r
- IN CONST VOID *UserStruct2\r
+ IN CONST VOID *UserStruct1,\r
+ IN CONST VOID *UserStruct2\r
)\r
{\r
- CONST BLOB *Blob1;\r
+ CONST BLOB *Blob1;\r
\r
Blob1 = UserStruct1;\r
return BlobKeyCompare (Blob1->File, UserStruct2);\r
}\r
\r
-\r
/**\r
Comparator function for two opaque pointers, ordering on (unsigned) pointer\r
value itself.\r
INTN\r
EFIAPI\r
PointerCompare (\r
- IN CONST VOID *Pointer1,\r
- IN CONST VOID *Pointer2\r
+ IN CONST VOID *Pointer1,\r
+ IN CONST VOID *Pointer2\r
)\r
{\r
if (Pointer1 == Pointer2) {\r
return 0;\r
}\r
+\r
if ((UINTN)Pointer1 < (UINTN)Pointer2) {\r
return -1;\r
}\r
+\r
return 1;\r
}\r
\r
-\r
/**\r
Comparator function for two ASCII strings. Can be used as both Key and\r
UserStruct comparator.\r
INTN\r
EFIAPI\r
AsciiStringCompare (\r
- IN CONST VOID *AsciiString1,\r
- IN CONST VOID *AsciiString2\r
+ IN CONST VOID *AsciiString1,\r
+ IN CONST VOID *AsciiString2\r
)\r
{\r
return AsciiStrCmp (AsciiString1, AsciiString2);\r
}\r
\r
-\r
/**\r
Release the ORDERED_COLLECTION structure populated by\r
CollectAllocationsRestrictedTo32Bit() (below).\r
STATIC\r
VOID\r
ReleaseAllocationsRestrictedTo32Bit (\r
- IN ORDERED_COLLECTION *AllocationsRestrictedTo32Bit\r
-)\r
+ IN ORDERED_COLLECTION *AllocationsRestrictedTo32Bit\r
+ )\r
{\r
- ORDERED_COLLECTION_ENTRY *Entry, *Entry2;\r
+ ORDERED_COLLECTION_ENTRY *Entry, *Entry2;\r
\r
for (Entry = OrderedCollectionMin (AllocationsRestrictedTo32Bit);\r
Entry != NULL;\r
- Entry = Entry2) {\r
+ Entry = Entry2)\r
+ {\r
Entry2 = OrderedCollectionNext (Entry);\r
OrderedCollectionDelete (AllocationsRestrictedTo32Bit, Entry, NULL);\r
}\r
+\r
OrderedCollectionUninit (AllocationsRestrictedTo32Bit);\r
}\r
\r
-\r
/**\r
Iterate over the linker/loader script, and collect the names of the fw_cfg\r
blobs that are referenced by QEMU_LOADER_ADD_POINTER.PointeeFile fields, such\r
STATIC\r
EFI_STATUS\r
CollectAllocationsRestrictedTo32Bit (\r
- OUT ORDERED_COLLECTION **AllocationsRestrictedTo32Bit,\r
- IN CONST QEMU_LOADER_ENTRY *LoaderStart,\r
- IN CONST QEMU_LOADER_ENTRY *LoaderEnd\r
-)\r
+ OUT ORDERED_COLLECTION **AllocationsRestrictedTo32Bit,\r
+ IN CONST QEMU_LOADER_ENTRY *LoaderStart,\r
+ IN CONST QEMU_LOADER_ENTRY *LoaderEnd\r
+ )\r
{\r
- ORDERED_COLLECTION *Collection;\r
- CONST QEMU_LOADER_ENTRY *LoaderEntry;\r
- EFI_STATUS Status;\r
+ ORDERED_COLLECTION *Collection;\r
+ CONST QEMU_LOADER_ENTRY *LoaderEntry;\r
+ EFI_STATUS Status;\r
\r
Collection = OrderedCollectionInit (AsciiStringCompare, AsciiStringCompare);\r
if (Collection == NULL) {\r
}\r
\r
for (LoaderEntry = LoaderStart; LoaderEntry < LoaderEnd; ++LoaderEntry) {\r
- CONST QEMU_LOADER_ADD_POINTER *AddPointer;\r
+ CONST QEMU_LOADER_ADD_POINTER *AddPointer;\r
\r
if (LoaderEntry->Type != QemuLoaderCmdAddPointer) {\r
continue;\r
}\r
+\r
AddPointer = &LoaderEntry->Command.AddPointer;\r
\r
if (AddPointer->PointerSize >= 8) {\r
(VOID *)AddPointer->PointeeFile\r
);\r
switch (Status) {\r
- case EFI_SUCCESS:\r
- DEBUG ((\r
- DEBUG_VERBOSE,\r
- "%a: restricting blob \"%a\" from 64-bit allocation\n",\r
- __FUNCTION__,\r
- AddPointer->PointeeFile\r
- ));\r
- break;\r
- case EFI_ALREADY_STARTED:\r
- //\r
- // The restriction has been recorded already.\r
- //\r
- break;\r
- case EFI_OUT_OF_RESOURCES:\r
- goto RollBack;\r
- default:\r
- ASSERT (FALSE);\r
+ case EFI_SUCCESS:\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: restricting blob \"%a\" from 64-bit allocation\n",\r
+ __FUNCTION__,\r
+ AddPointer->PointeeFile\r
+ ));\r
+ break;\r
+ case EFI_ALREADY_STARTED:\r
+ //\r
+ // The restriction has been recorded already.\r
+ //\r
+ break;\r
+ case EFI_OUT_OF_RESOURCES:\r
+ goto RollBack;\r
+ default:\r
+ ASSERT (FALSE);\r
}\r
}\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Process a QEMU_LOADER_ALLOCATE command.\r
\r
EFI_STATUS\r
EFIAPI\r
ProcessCmdAllocate (\r
- IN CONST QEMU_LOADER_ALLOCATE *Allocate,\r
- IN OUT ORDERED_COLLECTION *Tracker,\r
- IN ORDERED_COLLECTION *AllocationsRestrictedTo32Bit\r
+ IN CONST QEMU_LOADER_ALLOCATE *Allocate,\r
+ IN OUT ORDERED_COLLECTION *Tracker,\r
+ IN ORDERED_COLLECTION *AllocationsRestrictedTo32Bit\r
)\r
{\r
- FIRMWARE_CONFIG_ITEM FwCfgItem;\r
- UINTN FwCfgSize;\r
- EFI_STATUS Status;\r
- UINTN NumPages;\r
- EFI_PHYSICAL_ADDRESS Address;\r
- BLOB *Blob;\r
+ FIRMWARE_CONFIG_ITEM FwCfgItem;\r
+ UINTN FwCfgSize;\r
+ EFI_STATUS Status;\r
+ UINTN NumPages;\r
+ EFI_PHYSICAL_ADDRESS Address;\r
+ BLOB *Blob;\r
\r
if (Allocate->File[QEMU_LOADER_FNAME_SIZE - 1] != '\0') {\r
DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));\r
}\r
\r
if (Allocate->Alignment > EFI_PAGE_SIZE) {\r
- DEBUG ((DEBUG_ERROR, "%a: unsupported alignment 0x%x\n", __FUNCTION__,\r
- Allocate->Alignment));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: unsupported alignment 0x%x\n",\r
+ __FUNCTION__,\r
+ Allocate->Alignment\r
+ ));\r
return EFI_UNSUPPORTED;\r
}\r
\r
Status = QemuFwCfgFindFile ((CHAR8 *)Allocate->File, &FwCfgItem, &FwCfgSize);\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((DEBUG_ERROR, "%a: QemuFwCfgFindFile(\"%a\"): %r\n", __FUNCTION__,\r
- Allocate->File, Status));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: QemuFwCfgFindFile(\"%a\"): %r\n",\r
+ __FUNCTION__,\r
+ Allocate->File,\r
+ Status\r
+ ));\r
return Status;\r
}\r
\r
NumPages = EFI_SIZE_TO_PAGES (FwCfgSize);\r
- Address = MAX_UINT64;\r
+ Address = MAX_UINT64;\r
if (OrderedCollectionFind (\r
AllocationsRestrictedTo32Bit,\r
Allocate->File\r
- ) != NULL) {\r
+ ) != NULL)\r
+ {\r
Address = MAX_UINT32;\r
}\r
- Status = gBS->AllocatePages (AllocateMaxAddress, EfiACPIMemoryNVS, NumPages,\r
- &Address);\r
+\r
+ Status = gBS->AllocatePages (\r
+ AllocateMaxAddress,\r
+ EfiACPIMemoryNVS,\r
+ NumPages,\r
+ &Address\r
+ );\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
Status = EFI_OUT_OF_RESOURCES;\r
goto FreePages;\r
}\r
+\r
CopyMem (Blob->File, Allocate->File, QEMU_LOADER_FNAME_SIZE);\r
- Blob->Size = FwCfgSize;\r
- Blob->Base = (VOID *)(UINTN)Address;\r
+ Blob->Size = FwCfgSize;\r
+ Blob->Base = (VOID *)(UINTN)Address;\r
Blob->HostsOnlyTableData = TRUE;\r
\r
Status = OrderedCollectionInsert (Tracker, NULL, Blob);\r
if (Status == RETURN_ALREADY_STARTED) {\r
- DEBUG ((DEBUG_ERROR, "%a: duplicated file \"%a\"\n", __FUNCTION__,\r
- Allocate->File));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: duplicated file \"%a\"\n",\r
+ __FUNCTION__,\r
+ Allocate->File\r
+ ));\r
Status = EFI_PROTOCOL_ERROR;\r
}\r
+\r
if (EFI_ERROR (Status)) {\r
goto FreeBlob;\r
}\r
QemuFwCfgReadBytes (FwCfgSize, Blob->Base);\r
ZeroMem (Blob->Base + Blob->Size, EFI_PAGES_TO_SIZE (NumPages) - Blob->Size);\r
\r
- DEBUG ((DEBUG_VERBOSE, "%a: File=\"%a\" Alignment=0x%x Zone=%d Size=0x%Lx "\r
- "Address=0x%Lx\n", __FUNCTION__, Allocate->File, Allocate->Alignment,\r
- Allocate->Zone, (UINT64)Blob->Size, (UINT64)(UINTN)Blob->Base));\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: File=\"%a\" Alignment=0x%x Zone=%d Size=0x%Lx "\r
+ "Address=0x%Lx\n",\r
+ __FUNCTION__,\r
+ Allocate->File,\r
+ Allocate->Alignment,\r
+ Allocate->Zone,\r
+ (UINT64)Blob->Size,\r
+ (UINT64)(UINTN)Blob->Base\r
+ ));\r
return EFI_SUCCESS;\r
\r
FreeBlob:\r
return Status;\r
}\r
\r
-\r
/**\r
Process a QEMU_LOADER_ADD_POINTER command.\r
\r
EFI_STATUS\r
EFIAPI\r
ProcessCmdAddPointer (\r
- IN CONST QEMU_LOADER_ADD_POINTER *AddPointer,\r
- IN CONST ORDERED_COLLECTION *Tracker\r
+ IN CONST QEMU_LOADER_ADD_POINTER *AddPointer,\r
+ IN CONST ORDERED_COLLECTION *Tracker\r
)\r
{\r
- ORDERED_COLLECTION_ENTRY *TrackerEntry, *TrackerEntry2;\r
- BLOB *Blob, *Blob2;\r
- UINT8 *PointerField;\r
- UINT64 PointerValue;\r
-\r
- if (AddPointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0' ||\r
- AddPointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') {\r
+ ORDERED_COLLECTION_ENTRY *TrackerEntry, *TrackerEntry2;\r
+ BLOB *Blob, *Blob2;\r
+ UINT8 *PointerField;\r
+ UINT64 PointerValue;\r
+\r
+ if ((AddPointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') ||\r
+ (AddPointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0'))\r
+ {\r
DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
- TrackerEntry = OrderedCollectionFind (Tracker, AddPointer->PointerFile);\r
+ TrackerEntry = OrderedCollectionFind (Tracker, AddPointer->PointerFile);\r
TrackerEntry2 = OrderedCollectionFind (Tracker, AddPointer->PointeeFile);\r
- if (TrackerEntry == NULL || TrackerEntry2 == NULL) {\r
- DEBUG ((DEBUG_ERROR, "%a: invalid blob reference(s) \"%a\" / \"%a\"\n",\r
- __FUNCTION__, AddPointer->PointerFile, AddPointer->PointeeFile));\r
+ if ((TrackerEntry == NULL) || (TrackerEntry2 == NULL)) {\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: invalid blob reference(s) \"%a\" / \"%a\"\n",\r
+ __FUNCTION__,\r
+ AddPointer->PointerFile,\r
+ AddPointer->PointeeFile\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
- Blob = OrderedCollectionUserStruct (TrackerEntry);\r
+ Blob = OrderedCollectionUserStruct (TrackerEntry);\r
Blob2 = OrderedCollectionUserStruct (TrackerEntry2);\r
- if ((AddPointer->PointerSize != 1 && AddPointer->PointerSize != 2 &&\r
- AddPointer->PointerSize != 4 && AddPointer->PointerSize != 8) ||\r
- Blob->Size < AddPointer->PointerSize ||\r
- Blob->Size - AddPointer->PointerSize < AddPointer->PointerOffset) {\r
- DEBUG ((DEBUG_ERROR, "%a: invalid pointer location or size in \"%a\"\n",\r
- __FUNCTION__, AddPointer->PointerFile));\r
+ if (((AddPointer->PointerSize != 1) && (AddPointer->PointerSize != 2) &&\r
+ (AddPointer->PointerSize != 4) && (AddPointer->PointerSize != 8)) ||\r
+ (Blob->Size < AddPointer->PointerSize) ||\r
+ (Blob->Size - AddPointer->PointerSize < AddPointer->PointerOffset))\r
+ {\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: invalid pointer location or size in \"%a\"\n",\r
+ __FUNCTION__,\r
+ AddPointer->PointerFile\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
PointerValue = 0;\r
CopyMem (&PointerValue, PointerField, AddPointer->PointerSize);\r
if (PointerValue >= Blob2->Size) {\r
- DEBUG ((DEBUG_ERROR, "%a: invalid pointer value in \"%a\"\n", __FUNCTION__,\r
- AddPointer->PointerFile));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: invalid pointer value in \"%a\"\n",\r
+ __FUNCTION__,\r
+ AddPointer->PointerFile\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
ASSERT ((UINTN)Blob2->Base <= MAX_ADDRESS - Blob2->Size);\r
\r
PointerValue += (UINT64)(UINTN)Blob2->Base;\r
- if (AddPointer->PointerSize < 8 &&\r
- RShiftU64 (PointerValue, AddPointer->PointerSize * 8) != 0) {\r
- DEBUG ((DEBUG_ERROR, "%a: relocated pointer value unrepresentable in "\r
- "\"%a\"\n", __FUNCTION__, AddPointer->PointerFile));\r
+ if ((AddPointer->PointerSize < 8) &&\r
+ (RShiftU64 (PointerValue, AddPointer->PointerSize * 8) != 0))\r
+ {\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: relocated pointer value unrepresentable in "\r
+ "\"%a\"\n",\r
+ __FUNCTION__,\r
+ AddPointer->PointerFile\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
CopyMem (PointerField, &PointerValue, AddPointer->PointerSize);\r
\r
- DEBUG ((DEBUG_VERBOSE, "%a: PointerFile=\"%a\" PointeeFile=\"%a\" "\r
- "PointerOffset=0x%x PointerSize=%d\n", __FUNCTION__,\r
- AddPointer->PointerFile, AddPointer->PointeeFile,\r
- AddPointer->PointerOffset, AddPointer->PointerSize));\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: PointerFile=\"%a\" PointeeFile=\"%a\" "\r
+ "PointerOffset=0x%x PointerSize=%d\n",\r
+ __FUNCTION__,\r
+ AddPointer->PointerFile,\r
+ AddPointer->PointeeFile,\r
+ AddPointer->PointerOffset,\r
+ AddPointer->PointerSize\r
+ ));\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Process a QEMU_LOADER_ADD_CHECKSUM command.\r
\r
EFI_STATUS\r
EFIAPI\r
ProcessCmdAddChecksum (\r
- IN CONST QEMU_LOADER_ADD_CHECKSUM *AddChecksum,\r
- IN CONST ORDERED_COLLECTION *Tracker\r
+ IN CONST QEMU_LOADER_ADD_CHECKSUM *AddChecksum,\r
+ IN CONST ORDERED_COLLECTION *Tracker\r
)\r
{\r
- ORDERED_COLLECTION_ENTRY *TrackerEntry;\r
- BLOB *Blob;\r
+ ORDERED_COLLECTION_ENTRY *TrackerEntry;\r
+ BLOB *Blob;\r
\r
if (AddChecksum->File[QEMU_LOADER_FNAME_SIZE - 1] != '\0') {\r
DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));\r
\r
TrackerEntry = OrderedCollectionFind (Tracker, AddChecksum->File);\r
if (TrackerEntry == NULL) {\r
- DEBUG ((DEBUG_ERROR, "%a: invalid blob reference \"%a\"\n", __FUNCTION__,\r
- AddChecksum->File));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: invalid blob reference \"%a\"\n",\r
+ __FUNCTION__,\r
+ AddChecksum->File\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
Blob = OrderedCollectionUserStruct (TrackerEntry);\r
- if (Blob->Size <= AddChecksum->ResultOffset ||\r
- Blob->Size < AddChecksum->Length ||\r
- Blob->Size - AddChecksum->Length < AddChecksum->Start) {\r
- DEBUG ((DEBUG_ERROR, "%a: invalid checksum range in \"%a\"\n",\r
- __FUNCTION__, AddChecksum->File));\r
+ if ((Blob->Size <= AddChecksum->ResultOffset) ||\r
+ (Blob->Size < AddChecksum->Length) ||\r
+ (Blob->Size - AddChecksum->Length < AddChecksum->Start))\r
+ {\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: invalid checksum range in \"%a\"\n",\r
+ __FUNCTION__,\r
+ AddChecksum->File\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
Blob->Base[AddChecksum->ResultOffset] = CalculateCheckSum8 (\r
- Blob->Base + AddChecksum->Start,\r
- AddChecksum->Length\r
- );\r
- DEBUG ((DEBUG_VERBOSE, "%a: File=\"%a\" ResultOffset=0x%x Start=0x%x "\r
- "Length=0x%x\n", __FUNCTION__, AddChecksum->File,\r
- AddChecksum->ResultOffset, AddChecksum->Start, AddChecksum->Length));\r
+ Blob->Base + AddChecksum->Start,\r
+ AddChecksum->Length\r
+ );\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: File=\"%a\" ResultOffset=0x%x Start=0x%x "\r
+ "Length=0x%x\n",\r
+ __FUNCTION__,\r
+ AddChecksum->File,\r
+ AddChecksum->ResultOffset,\r
+ AddChecksum->Start,\r
+ AddChecksum->Length\r
+ ));\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Process a QEMU_LOADER_WRITE_POINTER command.\r
\r
STATIC\r
EFI_STATUS\r
ProcessCmdWritePointer (\r
- IN CONST QEMU_LOADER_WRITE_POINTER *WritePointer,\r
- IN CONST ORDERED_COLLECTION *Tracker,\r
- IN OUT S3_CONTEXT *S3Context OPTIONAL\r
+ IN CONST QEMU_LOADER_WRITE_POINTER *WritePointer,\r
+ IN CONST ORDERED_COLLECTION *Tracker,\r
+ IN OUT S3_CONTEXT *S3Context OPTIONAL\r
)\r
{\r
- RETURN_STATUS Status;\r
- FIRMWARE_CONFIG_ITEM PointerItem;\r
- UINTN PointerItemSize;\r
- ORDERED_COLLECTION_ENTRY *PointeeEntry;\r
- BLOB *PointeeBlob;\r
- UINT64 PointerValue;\r
-\r
- if (WritePointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0' ||\r
- WritePointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') {\r
+ RETURN_STATUS Status;\r
+ FIRMWARE_CONFIG_ITEM PointerItem;\r
+ UINTN PointerItemSize;\r
+ ORDERED_COLLECTION_ENTRY *PointeeEntry;\r
+ BLOB *PointeeBlob;\r
+ UINT64 PointerValue;\r
+\r
+ if ((WritePointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') ||\r
+ (WritePointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0'))\r
+ {\r
DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
- Status = QemuFwCfgFindFile ((CONST CHAR8 *)WritePointer->PointerFile,\r
- &PointerItem, &PointerItemSize);\r
+ Status = QemuFwCfgFindFile (\r
+ (CONST CHAR8 *)WritePointer->PointerFile,\r
+ &PointerItem,\r
+ &PointerItemSize\r
+ );\r
PointeeEntry = OrderedCollectionFind (Tracker, WritePointer->PointeeFile);\r
- if (RETURN_ERROR (Status) || PointeeEntry == NULL) {\r
- DEBUG ((DEBUG_ERROR,\r
+ if (RETURN_ERROR (Status) || (PointeeEntry == NULL)) {\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
"%a: invalid fw_cfg file or blob reference \"%a\" / \"%a\"\n",\r
- __FUNCTION__, WritePointer->PointerFile, WritePointer->PointeeFile));\r
+ __FUNCTION__,\r
+ WritePointer->PointerFile,\r
+ WritePointer->PointeeFile\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
- if ((WritePointer->PointerSize != 1 && WritePointer->PointerSize != 2 &&\r
- WritePointer->PointerSize != 4 && WritePointer->PointerSize != 8) ||\r
+ if (((WritePointer->PointerSize != 1) && (WritePointer->PointerSize != 2) &&\r
+ (WritePointer->PointerSize != 4) && (WritePointer->PointerSize != 8)) ||\r
(PointerItemSize < WritePointer->PointerSize) ||\r
(PointerItemSize - WritePointer->PointerSize <\r
- WritePointer->PointerOffset)) {\r
- DEBUG ((DEBUG_ERROR, "%a: invalid pointer location or size in \"%a\"\n",\r
- __FUNCTION__, WritePointer->PointerFile));\r
+ WritePointer->PointerOffset))\r
+ {\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: invalid pointer location or size in \"%a\"\n",\r
+ __FUNCTION__,\r
+ WritePointer->PointerFile\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
- PointeeBlob = OrderedCollectionUserStruct (PointeeEntry);\r
+ PointeeBlob = OrderedCollectionUserStruct (PointeeEntry);\r
PointerValue = WritePointer->PointeeOffset;\r
if (PointerValue >= PointeeBlob->Size) {\r
DEBUG ((DEBUG_ERROR, "%a: invalid PointeeOffset\n", __FUNCTION__));\r
ASSERT ((UINTN)PointeeBlob->Base <= MAX_ADDRESS - PointeeBlob->Size);\r
\r
PointerValue += (UINT64)(UINTN)PointeeBlob->Base;\r
- if (WritePointer->PointerSize < 8 &&\r
- RShiftU64 (PointerValue, WritePointer->PointerSize * 8) != 0) {\r
- DEBUG ((DEBUG_ERROR, "%a: pointer value unrepresentable in \"%a\"\n",\r
- __FUNCTION__, WritePointer->PointerFile));\r
+ if ((WritePointer->PointerSize < 8) &&\r
+ (RShiftU64 (PointerValue, WritePointer->PointerSize * 8) != 0))\r
+ {\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: pointer value unrepresentable in \"%a\"\n",\r
+ __FUNCTION__,\r
+ WritePointer->PointerFile\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
// form, to be replayed during S3 resume.\r
//\r
if (S3Context != NULL) {\r
- EFI_STATUS SaveStatus;\r
+ EFI_STATUS SaveStatus;\r
\r
SaveStatus = SaveCondensedWritePointerToS3Context (\r
S3Context,\r
//\r
PointeeBlob->HostsOnlyTableData = FALSE;\r
\r
- DEBUG ((DEBUG_VERBOSE, "%a: PointerFile=\"%a\" PointeeFile=\"%a\" "\r
- "PointerOffset=0x%x PointeeOffset=0x%x PointerSize=%d\n", __FUNCTION__,\r
- WritePointer->PointerFile, WritePointer->PointeeFile,\r
- WritePointer->PointerOffset, WritePointer->PointeeOffset,\r
- WritePointer->PointerSize));\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: PointerFile=\"%a\" PointeeFile=\"%a\" "\r
+ "PointerOffset=0x%x PointeeOffset=0x%x PointerSize=%d\n",\r
+ __FUNCTION__,\r
+ WritePointer->PointerFile,\r
+ WritePointer->PointeeFile,\r
+ WritePointer->PointerOffset,\r
+ WritePointer->PointeeOffset,\r
+ WritePointer->PointerSize\r
+ ));\r
return EFI_SUCCESS;\r
}\r
\r
-\r
/**\r
Undo a QEMU_LOADER_WRITE_POINTER command.\r
\r
STATIC\r
VOID\r
UndoCmdWritePointer (\r
- IN CONST QEMU_LOADER_WRITE_POINTER *WritePointer\r
+ IN CONST QEMU_LOADER_WRITE_POINTER *WritePointer\r
)\r
{\r
- RETURN_STATUS Status;\r
- FIRMWARE_CONFIG_ITEM PointerItem;\r
- UINTN PointerItemSize;\r
- UINT64 PointerValue;\r
-\r
- Status = QemuFwCfgFindFile ((CONST CHAR8 *)WritePointer->PointerFile,\r
- &PointerItem, &PointerItemSize);\r
+ RETURN_STATUS Status;\r
+ FIRMWARE_CONFIG_ITEM PointerItem;\r
+ UINTN PointerItemSize;\r
+ UINT64 PointerValue;\r
+\r
+ Status = QemuFwCfgFindFile (\r
+ (CONST CHAR8 *)WritePointer->PointerFile,\r
+ &PointerItem,\r
+ &PointerItemSize\r
+ );\r
ASSERT_RETURN_ERROR (Status);\r
\r
PointerValue = 0;\r
QemuFwCfgSkipBytes (WritePointer->PointerOffset);\r
QemuFwCfgWriteBytes (WritePointer->PointerSize, &PointerValue);\r
\r
- DEBUG ((DEBUG_VERBOSE,\r
- "%a: PointerFile=\"%a\" PointerOffset=0x%x PointerSize=%d\n", __FUNCTION__,\r
- WritePointer->PointerFile, WritePointer->PointerOffset,\r
- WritePointer->PointerSize));\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: PointerFile=\"%a\" PointerOffset=0x%x PointerSize=%d\n",\r
+ __FUNCTION__,\r
+ WritePointer->PointerFile,\r
+ WritePointer->PointerOffset,\r
+ WritePointer->PointerSize\r
+ ));\r
}\r
\r
-\r
//\r
// We'll be saving the keys of installed tables so that we can roll them back\r
// in case of failure. 128 tables should be enough for anyone (TM).\r
//\r
-#define INSTALLED_TABLES_MAX 128\r
+#define INSTALLED_TABLES_MAX 128\r
\r
/**\r
Process a QEMU_LOADER_ADD_POINTER command in order to see if its target byte\r
EFI_STATUS\r
EFIAPI\r
Process2ndPassCmdAddPointer (\r
- IN CONST QEMU_LOADER_ADD_POINTER *AddPointer,\r
- IN CONST ORDERED_COLLECTION *Tracker,\r
- IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol,\r
- IN OUT UINTN InstalledKey[INSTALLED_TABLES_MAX],\r
- IN OUT INT32 *NumInstalled,\r
- IN OUT ORDERED_COLLECTION *SeenPointers\r
+ IN CONST QEMU_LOADER_ADD_POINTER *AddPointer,\r
+ IN CONST ORDERED_COLLECTION *Tracker,\r
+ IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol,\r
+ IN OUT UINTN InstalledKey[INSTALLED_TABLES_MAX],\r
+ IN OUT INT32 *NumInstalled,\r
+ IN OUT ORDERED_COLLECTION *SeenPointers\r
)\r
{\r
- CONST ORDERED_COLLECTION_ENTRY *TrackerEntry;\r
- CONST ORDERED_COLLECTION_ENTRY *TrackerEntry2;\r
- ORDERED_COLLECTION_ENTRY *SeenPointerEntry;\r
- CONST BLOB *Blob;\r
- BLOB *Blob2;\r
- CONST UINT8 *PointerField;\r
- UINT64 PointerValue;\r
- UINTN Blob2Remaining;\r
- UINTN TableSize;\r
- CONST EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs;\r
- CONST EFI_ACPI_DESCRIPTION_HEADER *Header;\r
- EFI_STATUS Status;\r
-\r
- if (*NumInstalled < 0 || *NumInstalled > INSTALLED_TABLES_MAX) {\r
+ CONST ORDERED_COLLECTION_ENTRY *TrackerEntry;\r
+ CONST ORDERED_COLLECTION_ENTRY *TrackerEntry2;\r
+ ORDERED_COLLECTION_ENTRY *SeenPointerEntry;\r
+ CONST BLOB *Blob;\r
+ BLOB *Blob2;\r
+ CONST UINT8 *PointerField;\r
+ UINT64 PointerValue;\r
+ UINTN Blob2Remaining;\r
+ UINTN TableSize;\r
+ CONST EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *Facs;\r
+ CONST EFI_ACPI_DESCRIPTION_HEADER *Header;\r
+ EFI_STATUS Status;\r
+\r
+ if ((*NumInstalled < 0) || (*NumInstalled > INSTALLED_TABLES_MAX)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- TrackerEntry = OrderedCollectionFind (Tracker, AddPointer->PointerFile);\r
+ TrackerEntry = OrderedCollectionFind (Tracker, AddPointer->PointerFile);\r
TrackerEntry2 = OrderedCollectionFind (Tracker, AddPointer->PointeeFile);\r
- Blob = OrderedCollectionUserStruct (TrackerEntry);\r
- Blob2 = OrderedCollectionUserStruct (TrackerEntry2);\r
- PointerField = Blob->Base + AddPointer->PointerOffset;\r
- PointerValue = 0;\r
+ Blob = OrderedCollectionUserStruct (TrackerEntry);\r
+ Blob2 = OrderedCollectionUserStruct (TrackerEntry2);\r
+ PointerField = Blob->Base + AddPointer->PointerOffset;\r
+ PointerValue = 0;\r
CopyMem (&PointerValue, PointerField, AddPointer->PointerSize);\r
\r
//\r
// by the Blob2->Size check and later checks in ProcessCmdAddPointer().\r
//\r
Blob2Remaining = (UINTN)Blob2->Base;\r
- ASSERT(PointerValue >= Blob2Remaining);\r
+ ASSERT (PointerValue >= Blob2Remaining);\r
Blob2Remaining += Blob2->Size;\r
ASSERT (PointerValue < Blob2Remaining);\r
\r
));\r
Status = EFI_SUCCESS;\r
}\r
+\r
return Status;\r
}\r
\r
- Blob2Remaining -= (UINTN) PointerValue;\r
- DEBUG ((DEBUG_VERBOSE, "%a: checking for ACPI header in \"%a\" at 0x%Lx "\r
- "(remaining: 0x%Lx): ", __FUNCTION__, AddPointer->PointeeFile,\r
- PointerValue, (UINT64)Blob2Remaining));\r
+ Blob2Remaining -= (UINTN)PointerValue;\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: checking for ACPI header in \"%a\" at 0x%Lx "\r
+ "(remaining: 0x%Lx): ",\r
+ __FUNCTION__,\r
+ AddPointer->PointeeFile,\r
+ PointerValue,\r
+ (UINT64)Blob2Remaining\r
+ ));\r
\r
TableSize = 0;\r
\r
if (sizeof *Facs <= Blob2Remaining) {\r
Facs = (EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE *)(UINTN)PointerValue;\r
\r
- if (Facs->Length >= sizeof *Facs &&\r
- Facs->Length <= Blob2Remaining &&\r
- Facs->Signature ==\r
- EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {\r
- DEBUG ((DEBUG_VERBOSE, "found \"%-4.4a\" size 0x%x\n",\r
- (CONST CHAR8 *)&Facs->Signature, Facs->Length));\r
+ if ((Facs->Length >= sizeof *Facs) &&\r
+ (Facs->Length <= Blob2Remaining) &&\r
+ (Facs->Signature ==\r
+ EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE))\r
+ {\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "found \"%-4.4a\" size 0x%x\n",\r
+ (CONST CHAR8 *)&Facs->Signature,\r
+ Facs->Length\r
+ ));\r
TableSize = Facs->Length;\r
}\r
}\r
//\r
// check for the uniform tables\r
//\r
- if (TableSize == 0 && sizeof *Header <= Blob2Remaining) {\r
+ if ((TableSize == 0) && (sizeof *Header <= Blob2Remaining)) {\r
Header = (EFI_ACPI_DESCRIPTION_HEADER *)(UINTN)PointerValue;\r
\r
- if (Header->Length >= sizeof *Header &&\r
- Header->Length <= Blob2Remaining &&\r
- CalculateSum8 ((CONST UINT8 *)Header, Header->Length) == 0) {\r
+ if ((Header->Length >= sizeof *Header) &&\r
+ (Header->Length <= Blob2Remaining) &&\r
+ (CalculateSum8 ((CONST UINT8 *)Header, Header->Length) == 0))\r
+ {\r
//\r
// This looks very much like an ACPI table from QEMU:\r
// - Length field consistent with both ACPI and containing blob size\r
// - checksum is correct\r
//\r
- DEBUG ((DEBUG_VERBOSE, "found \"%-4.4a\" size 0x%x\n",\r
- (CONST CHAR8 *)&Header->Signature, Header->Length));\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "found \"%-4.4a\" size 0x%x\n",\r
+ (CONST CHAR8 *)&Header->Signature,\r
+ Header->Length\r
+ ));\r
TableSize = Header->Length;\r
\r
//\r
// Skip RSDT and XSDT because those are handled by\r
// EFI_ACPI_TABLE_PROTOCOL automatically.\r
- if (Header->Signature ==\r
- EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE ||\r
- Header->Signature ==\r
- EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE) {\r
+ if ((Header->Signature ==\r
+ EFI_ACPI_1_0_ROOT_SYSTEM_DESCRIPTION_TABLE_SIGNATURE) ||\r
+ (Header->Signature ==\r
+ EFI_ACPI_2_0_EXTENDED_SYSTEM_DESCRIPTION_TABLE_SIGNATURE))\r
+ {\r
return EFI_SUCCESS;\r
}\r
}\r
}\r
\r
if (*NumInstalled == INSTALLED_TABLES_MAX) {\r
- DEBUG ((DEBUG_ERROR, "%a: can't install more than %d tables\n",\r
- __FUNCTION__, INSTALLED_TABLES_MAX));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: can't install more than %d tables\n",\r
+ __FUNCTION__,\r
+ INSTALLED_TABLES_MAX\r
+ ));\r
Status = EFI_OUT_OF_RESOURCES;\r
goto RollbackSeenPointer;\r
}\r
\r
- Status = AcpiProtocol->InstallAcpiTable (AcpiProtocol,\r
- (VOID *)(UINTN)PointerValue, TableSize,\r
- &InstalledKey[*NumInstalled]);\r
+ Status = AcpiProtocol->InstallAcpiTable (\r
+ AcpiProtocol,\r
+ (VOID *)(UINTN)PointerValue,\r
+ TableSize,\r
+ &InstalledKey[*NumInstalled]\r
+ );\r
if (EFI_ERROR (Status)) {\r
- DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTable(): %r\n", __FUNCTION__,\r
- Status));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: InstallAcpiTable(): %r\n",\r
+ __FUNCTION__,\r
+ Status\r
+ ));\r
goto RollbackSeenPointer;\r
}\r
+\r
++*NumInstalled;\r
return EFI_SUCCESS;\r
\r
return Status;\r
}\r
\r
-\r
/**\r
Download, process, and install ACPI table data from the QEMU loader\r
interface.\r
EFI_STATUS\r
EFIAPI\r
InstallQemuFwCfgTables (\r
- IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol\r
+ IN EFI_ACPI_TABLE_PROTOCOL *AcpiProtocol\r
)\r
{\r
- EFI_STATUS Status;\r
- FIRMWARE_CONFIG_ITEM FwCfgItem;\r
- UINTN FwCfgSize;\r
- QEMU_LOADER_ENTRY *LoaderStart;\r
- CONST QEMU_LOADER_ENTRY *LoaderEntry, *LoaderEnd;\r
- CONST QEMU_LOADER_ENTRY *WritePointerSubsetEnd;\r
- ORIGINAL_ATTRIBUTES *OriginalPciAttributes;\r
- UINTN OriginalPciAttributesCount;\r
- ORDERED_COLLECTION *AllocationsRestrictedTo32Bit;\r
- S3_CONTEXT *S3Context;\r
- ORDERED_COLLECTION *Tracker;\r
- UINTN *InstalledKey;\r
- INT32 Installed;\r
- ORDERED_COLLECTION_ENTRY *TrackerEntry, *TrackerEntry2;\r
- ORDERED_COLLECTION *SeenPointers;\r
- ORDERED_COLLECTION_ENTRY *SeenPointerEntry, *SeenPointerEntry2;\r
+ EFI_STATUS Status;\r
+ FIRMWARE_CONFIG_ITEM FwCfgItem;\r
+ UINTN FwCfgSize;\r
+ QEMU_LOADER_ENTRY *LoaderStart;\r
+ CONST QEMU_LOADER_ENTRY *LoaderEntry, *LoaderEnd;\r
+ CONST QEMU_LOADER_ENTRY *WritePointerSubsetEnd;\r
+ ORIGINAL_ATTRIBUTES *OriginalPciAttributes;\r
+ UINTN OriginalPciAttributesCount;\r
+ ORDERED_COLLECTION *AllocationsRestrictedTo32Bit;\r
+ S3_CONTEXT *S3Context;\r
+ ORDERED_COLLECTION *Tracker;\r
+ UINTN *InstalledKey;\r
+ INT32 Installed;\r
+ ORDERED_COLLECTION_ENTRY *TrackerEntry, *TrackerEntry2;\r
+ ORDERED_COLLECTION *SeenPointers;\r
+ ORDERED_COLLECTION_ENTRY *SeenPointerEntry, *SeenPointerEntry2;\r
\r
Status = QemuFwCfgFindFile ("etc/table-loader", &FwCfgItem, &FwCfgSize);\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
if (FwCfgSize % sizeof *LoaderEntry != 0) {\r
- DEBUG ((DEBUG_ERROR, "%a: \"etc/table-loader\" has invalid size 0x%Lx\n",\r
- __FUNCTION__, (UINT64)FwCfgSize));\r
+ DEBUG ((\r
+ DEBUG_ERROR,\r
+ "%a: \"etc/table-loader\" has invalid size 0x%Lx\n",\r
+ __FUNCTION__,\r
+ (UINT64)FwCfgSize\r
+ ));\r
return EFI_PROTOCOL_ERROR;\r
}\r
\r
if (LoaderStart == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
EnablePciDecoding (&OriginalPciAttributes, &OriginalPciAttributesCount);\r
QemuFwCfgSelectItem (FwCfgItem);\r
QemuFwCfgReadBytes (FwCfgSize, LoaderStart);\r
LoaderEnd = LoaderStart + FwCfgSize / sizeof *LoaderEntry;\r
\r
AllocationsRestrictedTo32Bit = NULL;\r
- Status = CollectAllocationsRestrictedTo32Bit (\r
- &AllocationsRestrictedTo32Bit,\r
- LoaderStart,\r
- LoaderEnd\r
- );\r
+ Status = CollectAllocationsRestrictedTo32Bit (\r
+ &AllocationsRestrictedTo32Bit,\r
+ LoaderStart,\r
+ LoaderEnd\r
+ );\r
if (EFI_ERROR (Status)) {\r
goto FreeLoader;\r
}\r
WritePointerSubsetEnd = LoaderStart;\r
for (LoaderEntry = LoaderStart; LoaderEntry < LoaderEnd; ++LoaderEntry) {\r
switch (LoaderEntry->Type) {\r
- case QemuLoaderCmdAllocate:\r
- Status = ProcessCmdAllocate (\r
- &LoaderEntry->Command.Allocate,\r
- Tracker,\r
- AllocationsRestrictedTo32Bit\r
- );\r
- break;\r
+ case QemuLoaderCmdAllocate:\r
+ Status = ProcessCmdAllocate (\r
+ &LoaderEntry->Command.Allocate,\r
+ Tracker,\r
+ AllocationsRestrictedTo32Bit\r
+ );\r
+ break;\r
\r
- case QemuLoaderCmdAddPointer:\r
- Status = ProcessCmdAddPointer (&LoaderEntry->Command.AddPointer,\r
- Tracker);\r
- break;\r
+ case QemuLoaderCmdAddPointer:\r
+ Status = ProcessCmdAddPointer (\r
+ &LoaderEntry->Command.AddPointer,\r
+ Tracker\r
+ );\r
+ break;\r
\r
- case QemuLoaderCmdAddChecksum:\r
- Status = ProcessCmdAddChecksum (&LoaderEntry->Command.AddChecksum,\r
- Tracker);\r
- break;\r
+ case QemuLoaderCmdAddChecksum:\r
+ Status = ProcessCmdAddChecksum (\r
+ &LoaderEntry->Command.AddChecksum,\r
+ Tracker\r
+ );\r
+ break;\r
\r
- case QemuLoaderCmdWritePointer:\r
- Status = ProcessCmdWritePointer (&LoaderEntry->Command.WritePointer,\r
- Tracker, S3Context);\r
+ case QemuLoaderCmdWritePointer:\r
+ Status = ProcessCmdWritePointer (\r
+ &LoaderEntry->Command.WritePointer,\r
+ Tracker,\r
+ S3Context\r
+ );\r
if (!EFI_ERROR (Status)) {\r
WritePointerSubsetEnd = LoaderEntry + 1;\r
}\r
+\r
break;\r
\r
- default:\r
- DEBUG ((DEBUG_VERBOSE, "%a: unknown loader command: 0x%x\n",\r
- __FUNCTION__, LoaderEntry->Type));\r
- break;\r
+ default:\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: unknown loader command: 0x%x\n",\r
+ __FUNCTION__,\r
+ LoaderEntry->Type\r
+ ));\r
+ break;\r
}\r
\r
if (EFI_ERROR (Status)) {\r
if (EFI_ERROR (Status)) {\r
goto UninstallAcpiTables;\r
}\r
+\r
//\r
// Ownership of S3Context has been transferred.\r
//\r
\r
for (SeenPointerEntry = OrderedCollectionMin (SeenPointers);\r
SeenPointerEntry != NULL;\r
- SeenPointerEntry = SeenPointerEntry2) {\r
+ SeenPointerEntry = SeenPointerEntry2)\r
+ {\r
SeenPointerEntry2 = OrderedCollectionNext (SeenPointerEntry);\r
OrderedCollectionDelete (SeenPointers, SeenPointerEntry, NULL);\r
}\r
+\r
OrderedCollectionUninit (SeenPointers);\r
\r
FreeKeys:\r
// not directly part of some ACPI table.\r
//\r
for (TrackerEntry = OrderedCollectionMin (Tracker); TrackerEntry != NULL;\r
- TrackerEntry = TrackerEntry2) {\r
- VOID *UserStruct;\r
- BLOB *Blob;\r
+ TrackerEntry = TrackerEntry2)\r
+ {\r
+ VOID *UserStruct;\r
+ BLOB *Blob;\r
\r
TrackerEntry2 = OrderedCollectionNext (TrackerEntry);\r
OrderedCollectionDelete (Tracker, TrackerEntry, &UserStruct);\r
Blob = UserStruct;\r
\r
if (EFI_ERROR (Status) || Blob->HostsOnlyTableData) {\r
- DEBUG ((DEBUG_VERBOSE, "%a: freeing \"%a\"\n", __FUNCTION__,\r
- Blob->File));\r
+ DEBUG ((\r
+ DEBUG_VERBOSE,\r
+ "%a: freeing \"%a\"\n",\r
+ __FUNCTION__,\r
+ Blob->File\r
+ ));\r
gBS->FreePages ((UINTN)Blob->Base, EFI_SIZE_TO_PAGES (Blob->Size));\r
}\r
+\r
FreePool (Blob);\r
}\r
+\r
OrderedCollectionUninit (Tracker);\r
\r
FreeS3Context:\r
projects / mirror_edk2.git / blobdiff