OvmfPkg: Update code to be more C11 compliant by using __func__

__FUNCTION__ is a pre-standard extension that gcc and Visual C++ among
others support, while __func__ was standardized in C99.

Since it's more standard, replace __FUNCTION__ with __func__ throughout
OvmfPkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>

6 files changed, 26 insertions, 26 deletions

diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/EntryPoint.c b/OvmfPkg/Bhyve/AcpiPlatformDxe/EntryPoint.c
index b6ef101b2a..23d1856ad5 100644
--- a/OvmfPkg/Bhyve/AcpiPlatformDxe/EntryPoint.c
+++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/EntryPoint.c
@@ -41,11 +41,11 @@ OnRootBridgesConnected (
   DEBUG ((

     DEBUG_INFO,

     "%a: root bridges have been connected, installing ACPI tables\n",

-    __FUNCTION__

+    __func__

     ));

   Status = InstallAcpiTables (FindAcpiTableProtocol ());

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTables: %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTables: %r\n", __func__, Status));

   }

 

   gBS->CloseEvent (Event);

@@ -71,7 +71,7 @@ AcpiPlatformEntryPoint (
       DEBUG_INFO,

       "%a: PCI or its enumeration disabled, installing "

       "ACPI tables\n",

-      __FUNCTION__

+      __func__

       ));

     return InstallAcpiTables (FindAcpiTableProtocol ());

   }

@@ -94,7 +94,7 @@ AcpiPlatformEntryPoint (
     DEBUG ((

       DEBUG_INFO,

       "%a: waiting for root bridges to be connected, registered callback\n",

-      __FUNCTION__

+      __func__

       ));

   }

 

diff --git a/OvmfPkg/Bhyve/AcpiPlatformDxe/PciDecoding.c b/OvmfPkg/Bhyve/AcpiPlatformDxe/PciDecoding.c
index d31fd65393..0dcf3517f1 100644
--- a/OvmfPkg/Bhyve/AcpiPlatformDxe/PciDecoding.c
+++ b/OvmfPkg/Bhyve/AcpiPlatformDxe/PciDecoding.c
@@ -76,7 +76,7 @@ EnablePciDecoding (
     DEBUG ((

       DEBUG_WARN,

       "%a: LocateHandleBuffer(): %r\n",

-      __FUNCTION__,

+      __func__,

       Status

       ));

     return;

@@ -87,7 +87,7 @@ EnablePciDecoding (
     DEBUG ((

       DEBUG_WARN,

       "%a: AllocatePool(): out of resources\n",

-      __FUNCTION__

+      __func__

       ));

     goto FreeHandles;

   }

@@ -120,7 +120,7 @@ EnablePciDecoding (
       DEBUG ((

         DEBUG_WARN,

         "%a: EfiPciIoAttributeOperationGet: %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

       goto RestoreAttributes;

@@ -139,7 +139,7 @@ EnablePciDecoding (
       DEBUG ((

         DEBUG_WARN,

         "%a: EfiPciIoAttributeOperationSupported: %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

       goto RestoreAttributes;

@@ -159,7 +159,7 @@ EnablePciDecoding (
       DEBUG ((

         DEBUG_WARN,

         "%a: EfiPciIoAttributeOperationEnable: %r\n",

-        __FUNCTION__,

+        __func__,

         Status

         ));

       goto RestoreAttributes;

diff --git a/OvmfPkg/Bhyve/BhyveRfbDxe/VbeShim.c b/OvmfPkg/Bhyve/BhyveRfbDxe/VbeShim.c
index 41f0180001..ea7a364d85 100644
--- a/OvmfPkg/Bhyve/BhyveRfbDxe/VbeShim.c
+++ b/OvmfPkg/Bhyve/BhyveRfbDxe/VbeShim.c
@@ -147,7 +147,7 @@ InstallVbeShim (
       DEBUG ((

         DEBUG_VERBOSE,

         "%a: Video BIOS handler found at %04x:%04x\n",

-        __FUNCTION__,

+        __func__,

         Int0x10->Segment,

         Int0x10->Offset

         ));

@@ -161,7 +161,7 @@ InstallVbeShim (
     DEBUG ((

       DEBUG_VERBOSE,

       "%a: failed to allocate page at zero: %r\n",

-      __FUNCTION__,

+      __func__,

       Status

       ));

   } else {

@@ -271,7 +271,7 @@ InstallVbeShim (
   DEBUG ((

     DEBUG_INFO,

     "%a: VBE shim installed to %x:%x\n",

-    __FUNCTION__,

+    __func__,

     Int0x10->Segment,

     Int0x10->Offset

     ));

diff --git a/OvmfPkg/Bhyve/PlatformPei/ClearCache.c b/OvmfPkg/Bhyve/PlatformPei/ClearCache.c
index 9f23f9a428..9e59f31df7 100644
--- a/OvmfPkg/Bhyve/PlatformPei/ClearCache.c
+++ b/OvmfPkg/Bhyve/PlatformPei/ClearCache.c
@@ -59,7 +59,7 @@ ClearCacheOnMpServicesAvailable (
   EFI_PEI_MP_SERVICES_PPI  *MpServices;

   EFI_STATUS               Status;

 

-  DEBUG ((DEBUG_INFO, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__));

+  DEBUG ((DEBUG_INFO, "%a: %a\n", gEfiCallerBaseName, __func__));

 

   //

   // Clear cache on all the APs in parallel.

@@ -74,7 +74,7 @@ ClearCacheOnMpServicesAvailable (
                              NULL             // ProcedureArgument

                              );

   if (EFI_ERROR (Status) && (Status != EFI_NOT_STARTED)) {

-    DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status));

+    DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __func__, Status));

     return Status;

   }

 

@@ -108,7 +108,7 @@ InstallClearCacheCallback (
     DEBUG ((

       DEBUG_ERROR,

       "%a: failed to set up MP Services callback: %r\n",

-      __FUNCTION__,

+      __func__,

       Status

       ));

   }

diff --git a/OvmfPkg/Bhyve/PlatformPei/MemDetect.c b/OvmfPkg/Bhyve/PlatformPei/MemDetect.c
index 1949e586a0..29cbb9e3dc 100644
--- a/OvmfPkg/Bhyve/PlatformPei/MemDetect.c
+++ b/OvmfPkg/Bhyve/PlatformPei/MemDetect.c
@@ -58,7 +58,7 @@ Q35TsegMbytesInitialization (
       DEBUG_ERROR,

       "%a: no TSEG (SMRAM) on host bridge DID=0x%04x; "

       "only DID=0x%04x (Q35) is supported\n",

-      __FUNCTION__,

+      __func__,

       mHostBridgeDevId,

       INTEL_Q35_MCH_DEVICE_ID

       ));

@@ -92,7 +92,7 @@ Q35TsegMbytesInitialization (
   DEBUG ((

     DEBUG_INFO,

     "%a: QEMU offers an extended TSEG (%d MB)\n",

-    __FUNCTION__,

+    __func__,

     ExtendedTsegMbytes

     ));

   PcdStatus = PcdSet16S (PcdQ35TsegMbytes, ExtendedTsegMbytes);

@@ -185,7 +185,7 @@ GetFirstNonAddress (
       DEBUG ((

         DEBUG_INFO,

         "%a: disabling 64-bit PCI host aperture\n",

-        __FUNCTION__

+        __func__

         ));

       PcdStatus = PcdSet64S (PcdPciMmio64Size, 0);

       ASSERT_RETURN_ERROR (PcdStatus);

@@ -228,7 +228,7 @@ GetFirstNonAddress (
     DEBUG ((

       DEBUG_INFO,

       "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",

-      __FUNCTION__,

+      __func__,

       Pci64Base,

       Pci64Size

       ));

@@ -392,7 +392,7 @@ PublishPeiMemory (
     DEBUG ((

       DEBUG_INFO,

       "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n",

-      __FUNCTION__,

+      __func__,

       mPhysMemAddressWidth,

       PeiMemoryCap >> 10

       ));

@@ -441,7 +441,7 @@ QemuInitializeRam (
   MTRR_SETTINGS  MtrrSettings;

   EFI_STATUS     Status;

 

-  DEBUG ((DEBUG_INFO, "%a called\n", __FUNCTION__));

+  DEBUG ((DEBUG_INFO, "%a called\n", __func__));

 

   //

   // Determine total memory size available

diff --git a/OvmfPkg/Bhyve/PlatformPei/Platform.c b/OvmfPkg/Bhyve/PlatformPei/Platform.c
index eba7c60fce..2523e49e36 100644
--- a/OvmfPkg/Bhyve/PlatformPei/Platform.c
+++ b/OvmfPkg/Bhyve/PlatformPei/Platform.c
@@ -373,7 +373,7 @@ MiscInitialization (
       DEBUG ((

         DEBUG_ERROR,

         "%a: Unknown Host Bridge Device ID: 0x%04x\n",

-        __FUNCTION__,

+        __func__,

         mHostBridgeDevId

         ));

       ASSERT (FALSE);

@@ -501,17 +501,17 @@ S3Verification (
     DEBUG ((

       DEBUG_ERROR,

       "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n",

-      __FUNCTION__

+      __func__

       ));

     DEBUG ((

       DEBUG_ERROR,

       "%a: Please disable S3 on the QEMU command line (see the README),\n",

-      __FUNCTION__

+      __func__

       ));

     DEBUG ((

       DEBUG_ERROR,

       "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n",

-      __FUNCTION__

+      __func__

       ));

     ASSERT (FALSE);

     CpuDeadLoop ();

@@ -558,7 +558,7 @@ MaxCpuCountInitialization (
   DEBUG ((

     DEBUG_INFO,

     "%a: QEMU reports %d processor(s)\n",

-    __FUNCTION__,

+    __func__,

     ProcessorCount

     ));

 }