Changeset 101291 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Tcg

Timestamp:

Sep 27, 2023 1:34:02 PM (17 months ago)

Author:

vboxsync

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

159276

Message:

EFI/FirmwareNew: Make edk2-stable202308 build on all supported platforms (using gcc at least, msvc not tested yet), bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c (modified) (3 diffs)
• OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c

@@ -50 +50 @@
   EFI_STATUS  Status;
 
-  DEBUG ((DEBUG_INFO, "%a\n", __FUNCTION__));
+  DEBUG ((DEBUG_INFO, "%a\n", __func__));
 
   Status = InternalTpm12Detect ();
   if (!EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_INFO, "%a: TPM1.2 detected\n", __FUNCTION__));
+    DEBUG ((DEBUG_INFO, "%a: TPM1.2 detected\n", __func__));
     Size   = sizeof (gEfiTpmDeviceInstanceTpm12Guid);
     Status = PcdSetPtrS (
@@ -65 +65 @@
     Status = Tpm2RequestUseTpm ();
     if (!EFI_ERROR (Status)) {
-      DEBUG ((DEBUG_INFO, "%a: TPM2 detected\n", __FUNCTION__));
+      DEBUG ((DEBUG_INFO, "%a: TPM2 detected\n", __func__));
       Size   = sizeof (gEfiTpmDeviceInstanceTpm20DtpmGuid);
       Status = PcdSetPtrS (
@@ -74 +74 @@
       ASSERT_EFI_ERROR (Status);
     } else {
-      DEBUG ((DEBUG_INFO, "%a: no TPM detected\n", __FUNCTION__));
+      DEBUG ((DEBUG_INFO, "%a: no TPM detected\n", __func__));
       //
       // If no TPM2 was detected, we still need to install

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c

@@ -39 +39 @@
   EFI_STATUS     Status;
 
-  DEBUG ((DEBUG_INFO, "%a\n", __FUNCTION__));
+  DEBUG ((DEBUG_INFO, "%a\n", __func__));
 
   //
@@ -61 +61 @@
       DEBUG_INFO,
       "%a: mapping TPM MMIO address range unencrypted\n",
-      __FUNCTION__
+      __func__
       ));
 
@@ -74 +74 @@
         DEBUG_ERROR,
         "%a: failed to map TPM MMIO address range unencrypted\n",
-        __FUNCTION__
+        __func__
         ));
       ASSERT_RETURN_ERROR (DecryptStatus);