Changeset 108794 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/UefiLib/Acpi.c

Timestamp:

Mar 31, 2025 11:31:09 AM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168237

Message:

Devices/EFI/FirmwareNew: Merge edk2-stable202502 from the vendor branch and make it build for the important platforms, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdePkg/Library/UefiLib/Acpi.c (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/UefiLib/Acpi.c

@@ -221 +221 @@
                                                             NULL
                                                             );
-      Table = LocateAcpiDsdtFromFadt (Fadt);
+
+      if (Fadt != NULL) {
+        Table = LocateAcpiDsdtFromFadt (Fadt);
+      } else {
+        Table = NULL;
+      }
     } else if (Signature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {
       ASSERT (PreviousTable == NULL);
@@ -235 +240 @@
                                                             NULL
                                                             );
-      Table = LocateAcpiFacsFromFadt (Fadt);
+
+      if (Fadt != NULL) {
+        Table = LocateAcpiFacsFromFadt (Fadt);
+      } else {
+        Table = NULL;
+      }
     } else {
       Table = ScanTableInSDT (
@@ -276 +286 @@
                                                           NULL
                                                           );
-    Table = LocateAcpiDsdtFromFadt (Fadt);
+
+    if (Fadt != NULL) {
+      Table = LocateAcpiDsdtFromFadt (Fadt);
+    } else {
+      Table = NULL;
+    }
   } else if (Signature == EFI_ACPI_2_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) {
     ASSERT (PreviousTable == NULL);
@@ -290 +305 @@
                                                           NULL
                                                           );
-    Table = LocateAcpiFacsFromFadt (Fadt);
+
+    if (Fadt != NULL) {
+      Table = LocateAcpiFacsFromFadt (Fadt);
+    } else {
+      Table = NULL;
+    }
   } else {
     Table = ScanTableInSDT (