sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
__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>
This commit is contained in:
Rebecca Cran
2023-04-06 13:49:41 -06:00
committed by mergify[bot]
parent 089013a697
commit 8ba392687b
123 changed files with 540 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OvmfPkg/PlatformPei/ClearCache.c
View File

@@ -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
));
}

6
OvmfPkg/PlatformPei/FeatureControl.c
View File

@@ -85,7 +85,7 @@ OnMpServicesAvailable (
PlatformInfoHob = (EFI_HOB_PLATFORM_INFO *)GET_GUID_HOB_DATA (GuidHob);
DEBUG ((DEBUG_VERBOSE, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__));
DEBUG ((DEBUG_VERBOSE, "%a: %a\n", gEfiCallerBaseName, __func__));
//
// Write the MSR on all the APs in parallel.
@@ -100,7 +100,7 @@ OnMpServicesAvailable (
PlatformInfoHob // 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;
}
@@ -154,7 +154,7 @@ InstallFeatureControlCallback (
DEBUG ((
DEBUG_ERROR,
"%a: failed to set up MP Services callback: %r\n",
__FUNCTION__,
__func__,
Status
));
}

12
OvmfPkg/PlatformPei/MemDetect.c
View File

@@ -75,7 +75,7 @@ Q35TsegMbytesInitialization (
DEBUG ((
DEBUG_INFO,
"%a: QEMU offers an extended TSEG (%d MB)\n",
__FUNCTION__,
__func__,
ExtendedTsegMbytes
));
PcdStatus = PcdSet16S (PcdQ35TsegMbytes, ExtendedTsegMbytes);
@@ -97,7 +97,7 @@ Q35SmramAtDefaultSmbaseInitialization (
DEBUG ((
DEBUG_INFO,
"%a: SMRAM at default SMBASE not checked due to CSM\n",
__FUNCTION__
__func__
));
} else {
UINTN CtlReg;
@@ -111,7 +111,7 @@ Q35SmramAtDefaultSmbaseInitialization (
DEBUG ((
DEBUG_INFO,
"%a: SMRAM at default SMBASE %a\n",
__FUNCTION__,
__func__,
PlatformInfoHob->Q35SmramAtDefaultSmbase ? "found" : "not found"
));
}
@@ -152,7 +152,7 @@ AddressWidthInitialization (
DEBUG ((
DEBUG_INFO,
"%a: disabling 64-bit PCI host aperture\n",
__FUNCTION__
__func__
));
PcdStatus = PcdSet64S (PcdPciMmio64Size, 0);
ASSERT_RETURN_ERROR (PcdStatus);
@@ -175,7 +175,7 @@ AddressWidthInitialization (
DEBUG ((
DEBUG_INFO,
"%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n",
__FUNCTION__,
__func__,
PlatformInfoHob->PcdPciMmio64Base,
PlatformInfoHob->PcdPciMmio64Size
));
@@ -307,7 +307,7 @@ PublishPeiMemory (
DEBUG ((
DEBUG_INFO,
"%a: PhysMemAddressWidth=%d PeiMemoryCap=%u KB\n",
__FUNCTION__,
__func__,
PlatformInfoHob->PhysMemAddressWidth,
PeiMemoryCap >> 10
));

10
OvmfPkg/PlatformPei/MemTypeInfo.c
View File

@@ -100,7 +100,7 @@ RefreshMemTypeInfo (
// If the UEFI variable couldn't be read for some other reason, we
// similarly can't use it for udpating mMemoryTypeInformation.
//
DEBUG ((DEBUG_ERROR, "%a: GetVariable(): %r\n", __FUNCTION__, Status));
DEBUG ((DEBUG_ERROR, "%a: GetVariable(): %r\n", __func__, Status));
return;
}
@@ -111,7 +111,7 @@ RefreshMemTypeInfo (
DEBUG ((
DEBUG_ERROR,
"%a: invalid UEFI variable size %Lu\n",
__FUNCTION__,
__func__,
(UINT64)DataSize
));
return;
@@ -151,7 +151,7 @@ RefreshMemTypeInfo (
DEBUG ((
DEBUG_VERBOSE,
"%a: Type 0x%x: NumberOfPages 0x%x -> 0x%x\n",
__FUNCTION__,
__func__,
HobRecord->Type,
HobRecord->NumberOfPages,
VariableRecord->NumberOfPages
@@ -183,7 +183,7 @@ OnReadOnlyVariable2Available (
IN VOID *Ppi
)
{
DEBUG ((DEBUG_VERBOSE, "%a\n", __FUNCTION__));
DEBUG ((DEBUG_VERBOSE, "%a\n", __func__));
RefreshMemTypeInfo (Ppi);
BuildMemTypeInfoHob ();
@@ -222,7 +222,7 @@ MemTypeInfoInitialization (
DEBUG ((
DEBUG_ERROR,
"%a: failed to set up R/O Variable 2 callback: %r\n",
__FUNCTION__,
__func__,
Status
));
ASSERT (FALSE);

18
OvmfPkg/PlatformPei/Platform.c
View File

@@ -114,7 +114,7 @@ MicrovmInitialization (
Status = QemuFwCfgFindFile ("etc/fdt", &FdtItem, &FdtSize);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_INFO, "%a: no etc/fdt found in fw_cfg, using dummy\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: no etc/fdt found in fw_cfg, using dummy\n", __func__));
FdtItem = 0;
FdtSize = sizeof (EmptyFdt);
}
@@ -122,7 +122,7 @@ MicrovmInitialization (
FdtPages = EFI_SIZE_TO_PAGES (FdtSize);
NewBase = AllocatePages (FdtPages);
if (NewBase == NULL) {
DEBUG ((DEBUG_INFO, "%a: AllocatePages failed\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: AllocatePages failed\n", __func__));
return;
}
@@ -135,14 +135,14 @@ MicrovmInitialization (
FdtHobData = BuildGuidHob (&gFdtHobGuid, sizeof (*FdtHobData));
if (FdtHobData == NULL) {
DEBUG ((DEBUG_INFO, "%a: BuildGuidHob failed\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: BuildGuidHob failed\n", __func__));
return;
}
DEBUG ((
DEBUG_INFO,
"%a: fdt at 0x%x (size %d)\n",
__FUNCTION__,
__func__,
NewBase,
FdtSize
));
@@ -158,7 +158,7 @@ MiscInitializationForMicrovm (
ASSERT (PlatformInfoHob->HostBridgeDevId == 0xffff);
DEBUG ((DEBUG_INFO, "%a: microvm\n", __FUNCTION__));
DEBUG ((DEBUG_INFO, "%a: microvm\n", __func__));
//
// Disable A20 Mask
//
@@ -240,17 +240,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 ();
@@ -273,7 +273,7 @@ Q35BoardVerification (
DEBUG_ERROR,
"%a: no TSEG (SMRAM) on host bridge DID=0x%04x; "
"only DID=0x%04x (Q35) is supported\n",
__FUNCTION__,
__func__,
PlatformInfoHob->HostBridgeDevId,
INTEL_Q35_MCH_DEVICE_ID
));