diff options
author | Rebecca Cran <rebecca@bsdio.com> | 2023-04-06 13:49:41 -0600 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-04-10 14:19:57 +0000 |
commit | 8ba392687b6f7fcb6e333756edd090003c57402e (patch) | |
tree | 040194cbfaa73f764e86e050e9bc00b58e4fc60b /OvmfPkg/Bhyve/PlatformPei | |
parent | 089013a69724687f4051fc88367c9eb74def4284 (diff) | |
download | edk2-8ba392687b6f7fcb6e333756edd090003c57402e.tar.gz edk2-8ba392687b6f7fcb6e333756edd090003c57402e.tar.bz2 edk2-8ba392687b6f7fcb6e333756edd090003c57402e.zip |
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>
Diffstat (limited to 'OvmfPkg/Bhyve/PlatformPei')
-rw-r--r-- | OvmfPkg/Bhyve/PlatformPei/ClearCache.c | 6 | ||||
-rw-r--r-- | OvmfPkg/Bhyve/PlatformPei/MemDetect.c | 12 | ||||
-rw-r--r-- | OvmfPkg/Bhyve/PlatformPei/Platform.c | 10 |
3 files changed, 14 insertions, 14 deletions
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
));
}
|