diff options
Diffstat (limited to 'OvmfPkg/Library')
35 files changed, 193 insertions, 193 deletions
diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c index 6d1e1cb05e..150fe07c67 100644 --- a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c @@ -62,7 +62,7 @@ AcpiTimerLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
HostBridgeDevId
));
ASSERT (FALSE);
diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c index c771997a2a..9b3cd05511 100644 --- a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c @@ -59,7 +59,7 @@ AcpiTimerLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
HostBridgeDevId
));
ASSERT (FALSE);
@@ -119,7 +119,7 @@ InternalAcpiGetTimerTick ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
HostBridgeDevId
));
ASSERT (FALSE);
diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c index 01a41a6a45..03d47cf11c 100644 --- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c @@ -76,7 +76,7 @@ AcpiTimerLibConstructor ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
HostBridgeDevId
));
ASSERT (FALSE);
diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c index b9c0a5b25a..a1f6e61c1e 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/PeiDxeVirtualMemory.c @@ -164,7 +164,7 @@ AllocatePageTableMemory ( DEBUG_VERBOSE,
"%a:%a: Buffer=0x%Lx Pages=%ld\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Buffer,
Pages
));
@@ -561,7 +561,7 @@ InternalMemEncryptSevCreateIdentityMap1G ( DEBUG_VERBOSE,
"%a:%a: Cr3Base=0x%Lx Physical=0x%Lx Length=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Cr3BaseAddress,
PhysicalAddress,
(UINT64)Length
@@ -606,7 +606,7 @@ InternalMemEncryptSevCreateIdentityMap1G ( DEBUG_ERROR,
"%a:%a: bad PML4 for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
@@ -713,7 +713,7 @@ SetMemoryEncDec ( DEBUG_VERBOSE,
"%a:%a: Cr3Base=0x%Lx Physical=0x%Lx Length=0x%Lx Mode=%a CacheFlush=%u Mmio=%u\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Cr3BaseAddress,
PhysicalAddress,
(UINT64)Length,
@@ -786,7 +786,7 @@ SetMemoryEncDec ( DEBUG_ERROR,
"%a:%a: bad PML4 for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
@@ -803,7 +803,7 @@ SetMemoryEncDec ( DEBUG_ERROR,
"%a:%a: bad PDPE for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
@@ -824,7 +824,7 @@ SetMemoryEncDec ( DEBUG_VERBOSE,
"%a:%a: updated 1GB entry for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
PhysicalAddress += BIT30;
@@ -837,7 +837,7 @@ SetMemoryEncDec ( DEBUG_VERBOSE,
"%a:%a: splitting 1GB page for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Split1GPageTo2M (
@@ -865,7 +865,7 @@ SetMemoryEncDec ( DEBUG_ERROR,
"%a:%a: bad PDE for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
@@ -892,7 +892,7 @@ SetMemoryEncDec ( DEBUG_VERBOSE,
"%a:%a: splitting 2MB page for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Split2MPageTo4K (
@@ -917,7 +917,7 @@ SetMemoryEncDec ( DEBUG_ERROR,
"%a:%a: bad PTE for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c index 7a8878b1a9..85eb41585b 100644 --- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c @@ -113,7 +113,7 @@ PvalidateRange ( DEBUG_ERROR,
"%a:%a: Failed to %a address 0x%Lx Error code %d\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Validate ? "Validate" : "Invalidate",
Address,
Ret
@@ -237,7 +237,7 @@ InternalSetPageState ( DEBUG_VERBOSE,
"%a:%a Address 0x%Lx - 0x%Lx State = %a LargeEntry = %d\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
BaseAddress,
EndAddress,
State == SevSnpPageShared ? "Shared" : "Private",
diff --git a/OvmfPkg/Library/BaseMemEncryptTdxLib/MemoryEncryption.c b/OvmfPkg/Library/BaseMemEncryptTdxLib/MemoryEncryption.c index 5b13042512..a01dc98852 100644 --- a/OvmfPkg/Library/BaseMemEncryptTdxLib/MemoryEncryption.c +++ b/OvmfPkg/Library/BaseMemEncryptTdxLib/MemoryEncryption.c @@ -180,7 +180,7 @@ AllocatePageTableMemory ( DEBUG_VERBOSE,
"%a:%a: Buffer=0x%Lx Pages=%ld\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Buffer,
Pages
));
@@ -542,7 +542,7 @@ SetOrClearSharedBit ( TdStatus = TdVmCall (TDVMCALL_MAPGPA, PhysicalAddress, Length, 0, 0, NULL);
if (TdStatus != 0) {
- DEBUG ((DEBUG_ERROR, "%a: TdVmcall(MAPGPA) failed with %llx\n", __FUNCTION__, TdStatus));
+ DEBUG ((DEBUG_ERROR, "%a: TdVmcall(MAPGPA) failed with %llx\n", __func__, TdStatus));
ASSERT (FALSE);
return EFI_DEVICE_ERROR;
}
@@ -553,14 +553,14 @@ SetOrClearSharedBit ( if (Mode == ClearSharedBit) {
Status = gBS->LocateProtocol (&gEdkiiMemoryAcceptProtocolGuid, NULL, (VOID **)&MemoryAcceptProtocol);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "%a: Failed to locate MemoryAcceptProtocol with %r\n", __FUNCTION__, Status));
+ DEBUG ((DEBUG_ERROR, "%a: Failed to locate MemoryAcceptProtocol with %r\n", __func__, Status));
ASSERT (FALSE);
return Status;
}
Status = MemoryAcceptProtocol->AcceptMemory (MemoryAcceptProtocol, PhysicalAddress, Length);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "%a: Failed to AcceptMemory with %r\n", __FUNCTION__, Status));
+ DEBUG ((DEBUG_ERROR, "%a: Failed to AcceptMemory with %r\n", __func__, Status));
ASSERT (FALSE);
return Status;
}
@@ -570,7 +570,7 @@ SetOrClearSharedBit ( DEBUG_VERBOSE,
"%a:%a: pte=0x%Lx AddressEncMask=0x%Lx Mode=0x%x MapGPA Status=0x%x\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
*PageTablePointer,
AddressEncMask,
Mode,
@@ -677,7 +677,7 @@ SetMemorySharedOrPrivate ( DEBUG_VERBOSE,
"%a:%a: Cr3Base=0x%Lx Physical=0x%Lx Length=0x%Lx Mode=%a\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Cr3BaseAddress,
PhysicalAddress,
(UINT64)Length,
@@ -734,7 +734,7 @@ SetMemorySharedOrPrivate ( DEBUG_ERROR,
"%a:%a: bad PML4 for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
@@ -751,7 +751,7 @@ SetMemorySharedOrPrivate ( DEBUG_ERROR,
"%a:%a: bad PDPE for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
@@ -776,7 +776,7 @@ SetMemorySharedOrPrivate ( DEBUG_VERBOSE,
"%a:%a: updated 1GB entry for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
PhysicalAddress += BIT30;
@@ -789,7 +789,7 @@ SetMemorySharedOrPrivate ( DEBUG_VERBOSE,
"%a:%a: splitting 1GB page for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Split1GPageTo2M (
@@ -817,7 +817,7 @@ SetMemorySharedOrPrivate ( DEBUG_ERROR,
"%a:%a: bad PDE for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
@@ -848,7 +848,7 @@ SetMemorySharedOrPrivate ( DEBUG_VERBOSE,
"%a:%a: splitting 2MB page for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
@@ -877,7 +877,7 @@ SetMemorySharedOrPrivate ( DEBUG_ERROR,
"%a:%a: bad PTE for Physical=0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
PhysicalAddress
));
Status = RETURN_NO_MAPPING;
diff --git a/OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c b/OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c index 4215e6cdaa..766a2ccb9c 100644 --- a/OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c +++ b/OvmfPkg/Library/BasePciCapLib/BasePciCapLib.c @@ -427,7 +427,7 @@ DebugDumpPciCapList ( DEBUG_VERBOSE,
"%a:%a: %a 0x%04x %03u/%03u v0x%x @0x%03x+0x%03x\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(Info.Domain == PciCapNormal ? "Norm" : "Extd"),
Info.CapId,
Info.Instance,
@@ -753,7 +753,7 @@ FreeOutCapList: DEBUG_ERROR,
"%a:%a: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return Status;
diff --git a/OvmfPkg/Library/CcExitLib/CcExitVeHandler.c b/OvmfPkg/Library/CcExitLib/CcExitVeHandler.c index 2c1de0039d..9acc6fbe20 100644 --- a/OvmfPkg/Library/CcExitLib/CcExitVeHandler.c +++ b/OvmfPkg/Library/CcExitLib/CcExitVeHandler.c @@ -265,7 +265,7 @@ TdxMmioReadWrite ( UINT64 TdStatus;
if ((MmioSize != 1) && (MmioSize != 2) && (MmioSize != 4) && (MmioSize != 8)) {
- DEBUG ((DEBUG_ERROR, "%a: Invalid MmioSize - %d\n", __FUNCTION__, MmioSize));
+ DEBUG ((DEBUG_ERROR, "%a: Invalid MmioSize - %d\n", __func__, MmioSize));
return EFI_INVALID_PARAMETER;
}
@@ -283,7 +283,7 @@ TdxMmioReadWrite ( }
if (TdStatus != 0) {
- DEBUG ((DEBUG_ERROR, "%a: TdVmcall failed with %llx\n", __FUNCTION__, TdStatus));
+ DEBUG ((DEBUG_ERROR, "%a: TdVmcall failed with %llx\n", __func__, TdStatus));
return EFI_ABORTED;
}
@@ -334,7 +334,7 @@ ParseMmioExitInstructions ( Status = CcInitInstructionData (InstructionData, NULL, Regs);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "%a: Initialize InstructionData failed! (%r)\n", __FUNCTION__, Status));
+ DEBUG ((DEBUG_ERROR, "%a: Initialize InstructionData failed! (%r)\n", __func__, Status));
return Status;
}
@@ -361,7 +361,7 @@ ParseMmioExitInstructions ( 0);
if (InstructionData->Ext.ModRm.Mod == 3) {
- DEBUG ((DEBUG_ERROR, "%a: Parse Ext.ModRm.Mod error! (OpCode: 0x%x)\n", __FUNCTION__, OpCode));
+ DEBUG ((DEBUG_ERROR, "%a: Parse Ext.ModRm.Mod error! (OpCode: 0x%x)\n", __func__, OpCode));
return EFI_UNSUPPORTED;
}
@@ -440,7 +440,7 @@ ParseMmioExitInstructions ( //
// NPF on two register operands???
//
- DEBUG ((DEBUG_ERROR, "%a: Parse Ext.ModRm.Mod error! (OpCode: 0x%x)\n", __FUNCTION__, OpCode));
+ DEBUG ((DEBUG_ERROR, "%a: Parse Ext.ModRm.Mod error! (OpCode: 0x%x)\n", __func__, OpCode));
return EFI_UNSUPPORTED;
}
@@ -558,7 +558,7 @@ ParseMmioExitInstructions ( break;
default:
- DEBUG ((DEBUG_ERROR, "%a: Invalid MMIO opcode (%x)\n", __FUNCTION__, OpCode));
+ DEBUG ((DEBUG_ERROR, "%a: Invalid MMIO opcode (%x)\n", __func__, OpCode));
Status = EFI_UNSUPPORTED;
}
@@ -606,12 +606,12 @@ MmioExit ( Gpaw = (UINT8)(TdReturnData.TdInfo.Gpaw & 0x3f);
TdSharedPageMask = 1ULL << (Gpaw - 1);
} else {
- DEBUG ((DEBUG_ERROR, "%a: TDCALL failed with status=%llx\n", __FUNCTION__, TdStatus));
+ DEBUG ((DEBUG_ERROR, "%a: TDCALL failed with status=%llx\n", __func__, TdStatus));
goto FatalError;
}
if ((Veinfo->GuestPA & TdSharedPageMask) == 0) {
- DEBUG ((DEBUG_ERROR, "%a: EPT-violation #VE on private memory is not allowed!", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: EPT-violation #VE on private memory is not allowed!", __func__));
goto FatalError;
}
@@ -624,7 +624,7 @@ MmioExit ( DEBUG ((
DEBUG_ERROR,
"%a: Address is not correct! (%d: 0x%llx != 0x%llx)\n",
- __FUNCTION__,
+ __func__,
ParsedInstruction.OpCode,
Veinfo->GuestPA,
ParsedInstruction.Address
diff --git a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c index c751b10679..b99fb350aa 100644 --- a/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c +++ b/OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.c @@ -201,7 +201,7 @@ QemuLoadKernelImage ( DEBUG ((
Status == EFI_NOT_FOUND ? DEBUG_INFO : DEBUG_ERROR,
"%a: LoadImage(): %r\n",
- __FUNCTION__,
+ __func__,
Status
));
return Status;
@@ -279,7 +279,7 @@ QemuLoadKernelImage ( DEBUG ((
DEBUG_ERROR,
"%a: kernel command line is not NUL-terminated\n",
- __FUNCTION__
+ __func__
));
Status = EFI_PROTOCOL_ERROR;
goto FreeCommandLine;
@@ -330,7 +330,7 @@ QemuLoadKernelImage ( DEBUG ((
DEBUG_INFO,
"%a: command line: \"%s\"\n",
- __FUNCTION__,
+ __func__,
(CHAR16 *)KernelLoadedImage->LoadOptions
));
}
diff --git a/OvmfPkg/Library/HardwareInfoLib/HardwareInfoDxe.c b/OvmfPkg/Library/HardwareInfoLib/HardwareInfoDxe.c index a74de52871..5a1a69dcc3 100644 --- a/OvmfPkg/Library/HardwareInfoLib/HardwareInfoDxe.c +++ b/OvmfPkg/Library/HardwareInfoLib/HardwareInfoDxe.c @@ -91,7 +91,7 @@ FailedAllocate: DEBUG ((
EFI_D_ERROR,
"%a: Failed to allocate memory for hardware info\n",
- __FUNCTION__
+ __func__
));
return EFI_OUT_OF_RESOURCES;
diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c index 2000afeeb8..a8af4ea8d0 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c +++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c @@ -125,7 +125,7 @@ SaveLockBox ( DEBUG ((
DEBUG_VERBOSE,
"%a: Guid=%g Buffer=%p Length=0x%x\n",
- __FUNCTION__,
+ __func__,
Guid,
Buffer,
(UINT32)Length
@@ -196,7 +196,7 @@ SetLockBoxAttributes ( DEBUG ((
DEBUG_VERBOSE,
"%a: Guid=%g Attributes=0x%Lx\n",
- __FUNCTION__,
+ __func__,
Guid,
Attributes
));
@@ -253,7 +253,7 @@ UpdateLockBox ( DEBUG ((
DEBUG_VERBOSE,
"%a: Guid=%g Offset=0x%x Length=0x%x\n",
- __FUNCTION__,
+ __func__,
Guid,
(UINT32)Offset,
(UINT32)Length
@@ -315,7 +315,7 @@ RestoreLockBox ( DEBUG ((
DEBUG_VERBOSE,
"%a: Guid=%g Buffer=%p\n",
- __FUNCTION__,
+ __func__,
Guid,
Buffer
));
@@ -397,7 +397,7 @@ RestoreAllLockBoxInPlace ( DEBUG ((
DEBUG_VERBOSE,
"%a: Guid=%g Buffer=%p\n",
- __FUNCTION__,
+ __func__,
&Header->Guid,
Buffer
));
diff --git a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c index cad2bd6c96..0424aa5df1 100644 --- a/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c +++ b/OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.c @@ -156,7 +156,7 @@ PciHostBridgeUtilityInitRootBridge ( &mRootBridgeDevicePathTemplate
);
if (DevicePath == NULL) {
- DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));
+ DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, EFI_OUT_OF_RESOURCES));
return EFI_OUT_OF_RESOURCES;
}
@@ -166,7 +166,7 @@ PciHostBridgeUtilityInitRootBridge ( DEBUG ((
DEBUG_INFO,
"%a: populated root bus %d, with room for %d subordinate bus(es)\n",
- __FUNCTION__,
+ __func__,
RootBusNumber,
MaxSubBusNumber - RootBusNumber
));
@@ -253,7 +253,7 @@ PciHostBridgeUtilityGetRootBridgesBusScan ( DEBUG_ERROR,
"%a: invalid bus range with BusMin %Lu and BusMax "
"%Lu\n",
- __FUNCTION__,
+ __func__,
(UINT64)BusMin,
(UINT64)BusMax
));
@@ -283,7 +283,7 @@ PciHostBridgeUtilityGetRootBridgesBusScan ( DEBUG_ERROR,
"%a: invalid count of extra root buses (%Lu) "
"reported by QEMU\n",
- __FUNCTION__,
+ __func__,
ExtraRootBridges
));
return NULL;
@@ -292,7 +292,7 @@ PciHostBridgeUtilityGetRootBridgesBusScan ( DEBUG ((
DEBUG_INFO,
"%a: %Lu extra root buses reported by QEMU\n",
- __FUNCTION__,
+ __func__,
ExtraRootBridges
));
}
@@ -302,7 +302,7 @@ PciHostBridgeUtilityGetRootBridgesBusScan ( //
Bridges = AllocatePool ((1 + (UINTN)ExtraRootBridges) * sizeof *Bridges);
if (Bridges == NULL) {
- DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));
+ DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, EFI_OUT_OF_RESOURCES));
return NULL;
}
@@ -471,7 +471,7 @@ PciHostBridgeUtilityGetRootBridgesHostProvided ( DEBUG ((
DEBUG_ERROR,
"%a: Failed to allocate memory for hardware resources info\n",
- __FUNCTION__
+ __func__
));
return NULL;
}
@@ -495,7 +495,7 @@ PciHostBridgeUtilityGetRootBridgesHostProvided ( DEBUG_ERROR,
"%a: Failed to create hardware info list to retrieve host "
"bridges information from fw-cfg\n",
- __FUNCTION__
+ __func__
));
goto FreeBridges;
@@ -514,7 +514,7 @@ PciHostBridgeUtilityGetRootBridgesHostProvided ( DEBUG ((
DEBUG_INFO,
"%a: Host provided description for %Lu root bridges\n",
- __FUNCTION__,
+ __func__,
PciHostBridgeCount
));
@@ -523,7 +523,7 @@ PciHostBridgeUtilityGetRootBridgesHostProvided ( //
Bridges = AllocatePool (((UINTN)PciHostBridgeCount) * sizeof *Bridges);
if (Bridges == NULL) {
- DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));
+ DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, EFI_OUT_OF_RESOURCES));
goto FreeBridges;
}
@@ -567,7 +567,7 @@ PciHostBridgeUtilityGetRootBridgesHostProvided ( DEBUG_ERROR,
"%a: invalid bus range with BusMin %Lu and BusMax "
"%Lu\n",
- __FUNCTION__,
+ __func__,
(UINT64)RootBridgeNumber,
(UINT64)LastRootBridgeNumber
));
diff --git a/OvmfPkg/Library/PeilessStartupLib/X64/VirtualMemory.c b/OvmfPkg/Library/PeilessStartupLib/X64/VirtualMemory.c index b444c052d1..e2c1bac5e0 100644 --- a/OvmfPkg/Library/PeilessStartupLib/X64/VirtualMemory.c +++ b/OvmfPkg/Library/PeilessStartupLib/X64/VirtualMemory.c @@ -371,7 +371,7 @@ AllocatePageTableMemory ( DEBUG_INFO,
"%a:%a: Buffer=0x%Lx Pages=%ld, PageTablePool=%p\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Buffer,
Pages,
*PageTablePool
diff --git a/OvmfPkg/Library/PlatformBmPrintScLib/StatusCodeHandler.c b/OvmfPkg/Library/PlatformBmPrintScLib/StatusCodeHandler.c index 065673d904..18091640d1 100644 --- a/OvmfPkg/Library/PlatformBmPrintScLib/StatusCodeHandler.c +++ b/OvmfPkg/Library/PlatformBmPrintScLib/StatusCodeHandler.c @@ -122,7 +122,7 @@ HandleStatusCode ( DEBUG_ERROR,
"%a:%a: malformed Data\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
return EFI_INVALID_PARAMETER;
}
@@ -143,7 +143,7 @@ HandleStatusCode ( DEBUG_ERROR,
"%a:%a: failed to get %g:\"%s\": %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
&gEfiGlobalVariableGuid,
EFI_BOOT_CURRENT_VARIABLE_NAME,
Status
@@ -156,7 +156,7 @@ HandleStatusCode ( DEBUG_ERROR,
"%a:%a: got %Lu bytes for %g:\"%s\", expected %Lu\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)VariableSize,
&gEfiGlobalVariableGuid,
EFI_BOOT_CURRENT_VARIABLE_NAME,
@@ -180,7 +180,7 @@ HandleStatusCode ( DEBUG_ERROR,
"%a:%a: EfiBootManagerVariableToLoadOption(\"%s\"): %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
BootOptionName,
Status
));
@@ -309,7 +309,7 @@ PlatformBmPrintScRegisterHandler ( DEBUG_ERROR,
"%a:%a: failed to register status code handler: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return Status;
@@ -337,7 +337,7 @@ PlatformBmPrintScRegisterHandler ( "%a:%a: failed to create ExitBootServices() event: "
"%r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
StatusCodeRouter->Unregister (HandleStatusCode);
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c index 98f6f07341..a90076c9e6 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -275,7 +275,7 @@ RemoveStaleFvFileOptions ( DEBUG ((
EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,
"%a: removing stale Boot#%04x %s: %r\n",
- __FUNCTION__,
+ __func__,
(UINT32)BootOptions[Index].OptionNumber,
DevicePathString == NULL ? L"<unavailable>" : DevicePathString,
Status
@@ -479,7 +479,7 @@ PlatformBootManagerBeforeConsole ( DEBUG ((
EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE,
"%a: SetVariable(%s, %u): %r\n",
- __FUNCTION__,
+ __func__,
EFI_TIME_OUT_VARIABLE_NAME,
FrontPageTimeout,
Status
@@ -632,7 +632,7 @@ ConnectVirtioPciRng ( return EFI_SUCCESS;
Error:
- DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status));
+ DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, Status));
return Status;
}
@@ -1283,7 +1283,7 @@ SetPciIntLine ( DEBUG ((
DEBUG_ERROR,
"%a: PCI host bridge (00:00.0) should have no interrupts!\n",
- __FUNCTION__
+ __func__
));
ASSERT (FALSE);
}
@@ -1338,7 +1338,7 @@ SetPciIntLine ( DEBUG ((
DEBUG_VERBOSE,
"%a: [%02x:%02x.%x] %s -> 0x%02x\n",
- __FUNCTION__,
+ __func__,
(UINT32)Bus,
(UINT32)Device,
(UINT32)Function,
@@ -1416,7 +1416,7 @@ PciAcpiInitialization ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
mHostBridgeDevId
));
ASSERT (FALSE);
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/QemuKernel.c b/OvmfPkg/Library/PlatformBootManagerLib/QemuKernel.c index 1e66e3c452..84b25db521 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/QemuKernel.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/QemuKernel.c @@ -44,7 +44,7 @@ TryRunningQemuKernel ( DEBUG ((
DEBUG_ERROR,
"%a: QemuStartKernelImage(): %r\n",
- __FUNCTION__,
+ __func__,
Status
));
}
diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c index bf2701965f..ac9c02cb1c 100644 --- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c @@ -273,7 +273,7 @@ RemoveStaleFvFileOptions ( DEBUG ((
EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,
"%a: removing stale Boot#%04x %s: %r\n",
- __FUNCTION__,
+ __func__,
(UINT32)BootOptions[Index].OptionNumber,
DevicePathString == NULL ? L"<unavailable>" : DevicePathString,
Status
@@ -586,7 +586,7 @@ ConnectVirtioPciRng ( return EFI_SUCCESS;
Error:
- DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status));
+ DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, Status));
return Status;
}
@@ -1156,7 +1156,7 @@ SetPciIntLine ( DEBUG ((
DEBUG_ERROR,
"%a: PCI host bridge (00:00.0) should have no interrupts!\n",
- __FUNCTION__
+ __func__
));
ASSERT (FALSE);
}
@@ -1213,7 +1213,7 @@ SetPciIntLine ( DEBUG ((
DEBUG_VERBOSE,
"%a: [%02x:%02x.%x] %s -> 0x%02x\n",
- __FUNCTION__,
+ __func__,
(UINT32)Bus,
(UINT32)Device,
(UINT32)Function,
@@ -1283,7 +1283,7 @@ PciAcpiInitialization ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
mHostBridgeDevId
));
ASSERT (FALSE);
diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c index a402589206..df8e2fe157 100644 --- a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c @@ -280,7 +280,7 @@ RemoveStaleFvFileOptions ( DEBUG ((
EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,
"%a: removing stale Boot#%04x %s: %r\n",
- __FUNCTION__,
+ __func__,
(UINT32)BootOptions[Index].OptionNumber,
DevicePathString == NULL ? L"<unavailable>" : DevicePathString,
Status
@@ -551,7 +551,7 @@ ConnectVirtioPciRng ( return EFI_SUCCESS;
Error:
- DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status));
+ DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, Status));
return Status;
}
@@ -1157,7 +1157,7 @@ SetPciIntLine ( DEBUG ((
DEBUG_ERROR,
"%a: PCI host bridge (00:00.0) should have no interrupts!\n",
- __FUNCTION__
+ __func__
));
ASSERT (FALSE);
}
@@ -1212,7 +1212,7 @@ SetPciIntLine ( DEBUG ((
DEBUG_VERBOSE,
"%a: [%02x:%02x.%x] %s -> 0x%02x\n",
- __FUNCTION__,
+ __func__,
(UINT32)Bus,
(UINT32)Device,
(UINT32)Function,
@@ -1280,7 +1280,7 @@ PciAcpiInitialization ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
mHostBridgeDevId
));
ASSERT (FALSE);
diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c b/OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c index 1e66e3c452..84b25db521 100644 --- a/OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c +++ b/OvmfPkg/Library/PlatformBootManagerLibGrub/QemuKernel.c @@ -44,7 +44,7 @@ TryRunningQemuKernel ( DEBUG ((
DEBUG_ERROR,
"%a: QemuStartKernelImage(): %r\n",
- __FUNCTION__,
+ __func__,
Status
));
}
diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c index aced8535e6..acf90b4e93 100644 --- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c +++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c @@ -91,7 +91,7 @@ PlatformQemuUc32BaseInitialization ( DEBUG_VERBOSE,
"%a: rounded UC32 base from 0x%x up to 0x%x, for "
"an UC32 size of 0x%x\n",
- __FUNCTION__,
+ __func__,
PlatformInfoHob->LowMemory,
PlatformInfoHob->Uc32Base,
PlatformInfoHob->Uc32Size
@@ -123,7 +123,7 @@ PlatformGetFirstNonAddressCB ( Candidate = E820Entry->BaseAddr + E820Entry->Length;
if (PlatformInfoHob->FirstNonAddress < Candidate) {
- DEBUG ((DEBUG_INFO, "%a: FirstNonAddress=0x%Lx\n", __FUNCTION__, Candidate));
+ DEBUG ((DEBUG_INFO, "%a: FirstNonAddress=0x%Lx\n", __func__, Candidate));
PlatformInfoHob->FirstNonAddress = Candidate;
}
}
@@ -151,7 +151,7 @@ PlatformGetLowMemoryCB ( }
if (PlatformInfoHob->LowMemory < Candidate) {
- DEBUG ((DEBUG_INFO, "%a: LowMemory=0x%Lx\n", __FUNCTION__, Candidate));
+ DEBUG ((DEBUG_INFO, "%a: LowMemory=0x%Lx\n", __func__, Candidate));
PlatformInfoHob->LowMemory = (UINT32)Candidate;
}
}
@@ -180,7 +180,7 @@ PlatformAddHobCB ( Base = ALIGN_VALUE (Base, (UINT64)EFI_PAGE_SIZE);
End = End & ~(UINT64)EFI_PAGE_MASK;
if (Base < End) {
- DEBUG ((DEBUG_INFO, "%a: HighMemory [0x%Lx, 0x%Lx)\n", __FUNCTION__, Base, End));
+ DEBUG ((DEBUG_INFO, "%a: HighMemory [0x%Lx, 0x%Lx)\n", __func__, Base, End));
PlatformAddMemoryRangeHob (Base, End);
}
}
@@ -188,13 +188,13 @@ PlatformAddHobCB ( break;
case EfiAcpiAddressRangeReserved:
BuildResourceDescriptorHob (EFI_RESOURCE_MEMORY_RESERVED, 0, Base, End - Base);
- DEBUG ((DEBUG_INFO, "%a: Reserved [0x%Lx, 0x%Lx)\n", __FUNCTION__, Base, End));
+ DEBUG ((DEBUG_INFO, "%a: Reserved [0x%Lx, 0x%Lx)\n", __func__, Base, End));
break;
default:
DEBUG ((
DEBUG_WARN,
"%a: Type %u [0x%Lx, 0x%Lx) (NOT HANDLED)\n",
- __FUNCTION__,
+ __func__,
E820Entry->Type,
Base,
End
@@ -241,7 +241,7 @@ PlatformReservationConflictCB ( DEBUG ((
DEBUG_INFO,
"%a: move mmio: 0x%Lx => %Lx\n",
- __FUNCTION__,
+ __func__,
PlatformInfoHob->PcdPciMmio64Base,
NewBase
));
@@ -495,7 +495,7 @@ PlatformGetFirstNonAddress ( DEBUG ((
DEBUG_WARN,
"%a: ignoring malformed 64-bit PCI host aperture size from fw_cfg\n",
- __FUNCTION__
+ __func__
));
break;
}
@@ -505,7 +505,7 @@ PlatformGetFirstNonAddress ( DEBUG ((
DEBUG_INFO,
"%a: disabling 64-bit PCI host aperture\n",
- __FUNCTION__
+ __func__
));
}
@@ -534,7 +534,7 @@ PlatformGetFirstNonAddress ( DEBUG ((
DEBUG_VERBOSE,
"%a: HotPlugMemoryEnd=0x%Lx\n",
- __FUNCTION__,
+ __func__,
HotPlugMemoryEnd
));
@@ -638,7 +638,7 @@ PlatformAddressWidthFromCpuid ( DEBUG ((
DEBUG_INFO,
"%a: Signature: '%a', PhysBits: %d, QemuQuirk: %a, Valid: %a\n",
- __FUNCTION__,
+ __func__,
Signature,
PhysBits,
QemuQuirk ? "On" : "Off",
@@ -783,7 +783,7 @@ PlatformScanHostProvided64BitPciMmioEnd ( DEBUG ((
DEBUG_ERROR,
"%a: ignoring malformed hardware information from fw_cfg\n",
- __FUNCTION__
+ __func__
));
*PciMmioAddressEnd = 0;
return Status;
@@ -806,7 +806,7 @@ PlatformScanHostProvided64BitPciMmioEnd ( DEBUG ((
DEBUG_INFO,
"%a: Pci64End=0x%Lx\n",
- __FUNCTION__,
+ __func__,
*PciMmioAddressEnd
));
@@ -942,7 +942,7 @@ PlatformQemuInitializeRam ( 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/Library/PlatformInitLib/Platform.c b/OvmfPkg/Library/PlatformInitLib/Platform.c index 5cf8af825a..f48bf16ae3 100644 --- a/OvmfPkg/Library/PlatformInitLib/Platform.c +++ b/OvmfPkg/Library/PlatformInitLib/Platform.c @@ -358,7 +358,7 @@ PlatformMiscInitialization ( DEBUG ((
DEBUG_ERROR,
"%a: Unknown Host Bridge Device ID: 0x%04x\n",
- __FUNCTION__,
+ __func__,
PlatformInfoHob->HostBridgeDevId
));
ASSERT (FALSE);
@@ -366,7 +366,7 @@ PlatformMiscInitialization ( }
if (PlatformInfoHob->HostBridgeDevId == CLOUDHV_DEVICE_ID) {
- DEBUG ((DEBUG_INFO, "%a: Cloud Hypervisor is done.\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: Cloud Hypervisor is done.\n", __func__));
return;
}
@@ -489,12 +489,12 @@ PlatformCpuCountBugCheck ( DEBUG ((
DEBUG_ERROR,
"%a: Present=%u Possible=%u\n",
- __FUNCTION__,
+ __func__,
*Present,
*Possible
));
for (Idx = 0; Idx < ARRAY_SIZE (Message); ++Idx) {
- DEBUG ((DEBUG_ERROR, "%a: %a\n", __FUNCTION__, Message[Idx]));
+ DEBUG ((DEBUG_ERROR, "%a: %a\n", __func__, Message[Idx]));
}
ParseStatus = QemuFwCfgParseBool (
@@ -505,7 +505,7 @@ PlatformCpuCountBugCheck ( DEBUG ((
DEBUG_WARN,
"%a: \"%a\" active. You've been warned.\n",
- __FUNCTION__,
+ __func__,
CPUHP_BUGCHECK_OVERRIDE_FWCFG_FILE
));
//
@@ -531,7 +531,7 @@ PlatformCpuCountBugCheck ( DEBUG ((
DEBUG_WARN,
"%a: QEMU v2.7 reset bug: BootCpuCount=%d Present=%u\n",
- __FUNCTION__,
+ __func__,
*BootCpuCount,
*Present
));
@@ -573,7 +573,7 @@ PlatformMaxCpuCountInitialization ( // until PcdCpuApInitTimeOutInMicroSeconds elapses (whichever is reached
// first).
//
- DEBUG ((DEBUG_WARN, "%a: boot CPU count unavailable\n", __FUNCTION__));
+ DEBUG ((DEBUG_WARN, "%a: boot CPU count unavailable\n", __func__));
MaxCpuCount = PlatformInfoHob->DefaultMaxCpuNumber;
} else {
//
@@ -626,7 +626,7 @@ PlatformMaxCpuCountInitialization ( // steps. Both cases confirm modern mode.
//
CmdData2 = IoRead32 (CpuHpBase + QEMU_CPUHP_R_CMD_DATA2);
- DEBUG ((DEBUG_VERBOSE, "%a: CmdData2=0x%x\n", __FUNCTION__, CmdData2));
+ DEBUG ((DEBUG_VERBOSE, "%a: CmdData2=0x%x\n", __func__, CmdData2));
if (CmdData2 != 0) {
//
// QEMU doesn't support the modern CPU hotplug interface. Assume that the
@@ -635,7 +635,7 @@ PlatformMaxCpuCountInitialization ( DEBUG ((
DEBUG_WARN,
"%a: modern CPU hotplug interface unavailable\n",
- __FUNCTION__
+ __func__
));
MaxCpuCount = BootCpuCount;
} else {
@@ -693,7 +693,7 @@ PlatformMaxCpuCountInitialization ( DEBUG ((
DEBUG_INFO,
"%a: BootCpuCount=%d MaxCpuCount=%u\n",
- __FUNCTION__,
+ __func__,
BootCpuCount,
MaxCpuCount
));
diff --git a/OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c b/OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c index 37d488e01c..c32c3eddd5 100644 --- a/OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c +++ b/OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c @@ -227,7 +227,7 @@ CreateExtraRootBusMap ( DEBUG ((
DEBUG_VERBOSE,
"%a: extra bus position 0x%Lx maps to bus number (UID) 0x%x\n",
- __FUNCTION__,
+ __func__,
(UINT64)(Idx + 1),
Acpi->UID
));
diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c index cea4b7a099..2fe6ab30c0 100644 --- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c +++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c @@ -543,7 +543,7 @@ ParseOfwNode ( DEBUG ((
DEBUG_VERBOSE,
"%a: DriverName=\"%.*a\" UnitAddress=\"%.*a\" DeviceArguments=\"%.*a\"\n",
- __FUNCTION__,
+ __func__,
OfwNode->DriverName.Len,
OfwNode->DriverName.Ptr,
OfwNode->UnitAddress.Len,
@@ -1477,7 +1477,7 @@ TranslateOfwPath ( }
if (Status == RETURN_NOT_FOUND) {
- DEBUG ((DEBUG_VERBOSE, "%a: no more nodes\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: no more nodes\n", __func__));
return RETURN_NOT_FOUND;
}
@@ -1496,7 +1496,7 @@ TranslateOfwPath ( break;
case RETURN_INVALID_PARAMETER:
- DEBUG ((DEBUG_VERBOSE, "%a: parse error\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: parse error\n", __func__));
return RETURN_INVALID_PARAMETER;
default:
@@ -1512,22 +1512,22 @@ TranslateOfwPath ( );
switch (Status) {
case RETURN_SUCCESS:
- DEBUG ((DEBUG_VERBOSE, "%a: success: \"%s\"\n", __FUNCTION__, Translated));
+ DEBUG ((DEBUG_VERBOSE, "%a: success: \"%s\"\n", __func__, Translated));
break;
case RETURN_BUFFER_TOO_SMALL:
- DEBUG ((DEBUG_VERBOSE, "%a: buffer too small\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: buffer too small\n", __func__));
break;
case RETURN_UNSUPPORTED:
- DEBUG ((DEBUG_VERBOSE, "%a: unsupported\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: unsupported\n", __func__));
break;
case RETURN_PROTOCOL_ERROR:
DEBUG ((
DEBUG_VERBOSE,
"%a: logic error / system state mismatch\n",
- __FUNCTION__
+ __func__
));
break;
@@ -1604,9 +1604,9 @@ ConnectDevicesFromQemu ( goto FreeFwCfg;
}
- DEBUG ((DEBUG_VERBOSE, "%a: FwCfg:\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: FwCfg:\n", __func__));
DEBUG ((DEBUG_VERBOSE, "%a\n", FwCfg));
- DEBUG ((DEBUG_VERBOSE, "%a: FwCfg: <end>\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: FwCfg: <end>\n", __func__));
if (FeaturePcdGet (PcdQemuBootOrderPciTranslation)) {
EfiStatus = CreateExtraRootBusMap (&ExtraPciRoots);
@@ -1686,7 +1686,7 @@ ConnectDevicesFromQemu ( DEBUG ((
DEBUG_INFO,
"%a: %Lu OpenFirmware device path(s) connected\n",
- __FUNCTION__,
+ __func__,
(UINT64)NumConnected
));
Status = RETURN_SUCCESS;
@@ -1750,9 +1750,9 @@ StoreQemuBootOrder ( goto FreeFwCfg;
}
- DEBUG ((DEBUG_VERBOSE, "%a: FwCfg:\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: FwCfg:\n", __func__));
DEBUG ((DEBUG_VERBOSE, "%a\n", FwCfg));
- DEBUG ((DEBUG_VERBOSE, "%a: FwCfg: <end>\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: FwCfg: <end>\n", __func__));
if (FeaturePcdGet (PcdQemuBootOrderPciTranslation)) {
EfiStatus = CreateExtraRootBusMap (&ExtraPciRoots);
@@ -1797,7 +1797,7 @@ StoreQemuBootOrder ( L"VMMBootOrder%04x",
VariableIndex++
);
- DEBUG ((DEBUG_INFO, "%a: %s = %s\n", __FUNCTION__, VariableName, Translated));
+ DEBUG ((DEBUG_INFO, "%a: %s = %s\n", __func__, VariableName, Translated));
gRT->SetVariable (
VariableName,
&gVMMBootOrderGuid,
@@ -1944,7 +1944,7 @@ Match ( DEBUG ((
DEBUG_VERBOSE,
"%a: expanded relative device path \"%s\" for prefix matching\n",
- __FUNCTION__,
+ __func__,
Converted
));
FreePool (Converted);
@@ -1958,7 +1958,7 @@ Match ( DEBUG ((
DEBUG_VERBOSE,
"%a: against \"%s\": %a\n",
- __FUNCTION__,
+ __func__,
Converted,
Result ? "match" : "no match"
));
@@ -2068,7 +2068,7 @@ BootOrderComplete ( DEBUG ((
DEBUG_VERBOSE,
"%a: keeping \"%s\"\n",
- __FUNCTION__,
+ __func__,
Converted
));
}
@@ -2076,7 +2076,7 @@ BootOrderComplete ( DEBUG ((
DEBUG_VERBOSE,
"%a: dropping \"%s\"\n",
- __FUNCTION__,
+ __func__,
Converted
));
}
@@ -2211,9 +2211,9 @@ SetBootOrderFromQemu ( goto ErrorFreeFwCfg;
}
- DEBUG ((DEBUG_VERBOSE, "%a: FwCfg:\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: FwCfg:\n", __func__));
DEBUG ((DEBUG_VERBOSE, "%a\n", FwCfg));
- DEBUG ((DEBUG_VERBOSE, "%a: FwCfg: <end>\n", __FUNCTION__));
+ DEBUG ((DEBUG_VERBOSE, "%a: FwCfg: <end>\n", __func__));
FwCfgPtr = FwCfg;
BootOrder.Produced = 0;
@@ -2332,13 +2332,13 @@ SetBootOrderFromQemu ( DEBUG ((
DEBUG_ERROR,
"%a: setting BootOrder: %r\n",
- __FUNCTION__,
+ __func__,
Status
));
goto ErrorFreeExtraPciRoots;
}
- DEBUG ((DEBUG_INFO, "%a: setting BootOrder: success\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: setting BootOrder: success\n", __func__));
PruneBootVariables (ActiveOption, ActiveCount);
}
diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c index 6a810928a0..4250e633b5 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c @@ -103,7 +103,7 @@ QemuFwCfgInitialize ( DEBUG_ERROR,
"QemuFwCfgDma %a:%a Failed to locate IOMMU protocol.\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
ASSERT (FALSE);
CpuDeadLoop ();
@@ -186,7 +186,7 @@ AllocFwCfgDmaAccessBuffer ( DEBUG_ERROR,
"%a:%a failed to allocate FW_CFG_DMA_ACCESS\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
ASSERT (FALSE);
CpuDeadLoop ();
@@ -215,7 +215,7 @@ AllocFwCfgDmaAccessBuffer ( DEBUG_ERROR,
"%a:%a failed to Map() FW_CFG_DMA_ACCESS\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
ASSERT (FALSE);
CpuDeadLoop ();
@@ -228,7 +228,7 @@ AllocFwCfgDmaAccessBuffer ( DEBUG_ERROR,
"%a:%a failed to Map() - requested 0x%Lx got 0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)sizeof (FW_CFG_DMA_ACCESS),
(UINT64)Size
));
@@ -263,7 +263,7 @@ FreeFwCfgDmaAccessBuffer ( DEBUG_ERROR,
"%a:%a failed to UnMap() Mapping 0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)(UINTN)Mapping
));
ASSERT (FALSE);
@@ -276,7 +276,7 @@ FreeFwCfgDmaAccessBuffer ( DEBUG_ERROR,
"%a:%a failed to Free() 0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)(UINTN)Access
));
ASSERT (FALSE);
@@ -320,7 +320,7 @@ MapFwCfgDmaDataBuffer ( DEBUG_ERROR,
"%a:%a failed to Map() Address 0x%Lx Size 0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)(UINTN)HostAddress,
(UINT64)Size
));
@@ -334,7 +334,7 @@ MapFwCfgDmaDataBuffer ( DEBUG_ERROR,
"%a:%a failed to Map() - requested 0x%x got 0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Size,
(UINT64)NumberOfBytes
));
@@ -360,7 +360,7 @@ UnmapFwCfgDmaDataBuffer ( DEBUG_ERROR,
"%a:%a failed to UnMap() Mapping 0x%Lx\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)(UINTN)Mapping
));
ASSERT (FALSE);
diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c index 583d8a8e9f..115a210759 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c @@ -134,7 +134,7 @@ QemuFwCfgInitialize ( DEBUG ((
DEBUG_WARN,
"%a: No 'qemu,fw-cfg-mmio' compatible DT node found (Status == %r)\n",
- __FUNCTION__,
+ __func__,
Status
));
return EFI_SUCCESS;
diff --git a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c index 5706fa9be4..f523756438 100644 --- a/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c +++ b/OvmfPkg/Library/QemuFwCfgS3Lib/QemuFwCfgS3Dxe.c @@ -71,7 +71,7 @@ S3SaveStateInstalledNotify ( DEBUG_INFO,
"%a: %a: DmaAccess@0x%Lx ScratchBuffer@[0x%Lx+0x%Lx]\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)(UINTN)mDmaAccess,
(UINT64)(UINTN)mScratchBuffer,
(UINT64)mScratchBufferSize
@@ -161,7 +161,7 @@ QemuFwCfgS3CallWhenBootScriptReady ( DEBUG_ERROR,
"%a: %a: fw_cfg DMA unavailable\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
return RETURN_NOT_FOUND;
}
@@ -177,7 +177,7 @@ QemuFwCfgS3CallWhenBootScriptReady ( DEBUG_ERROR,
"%a: %a: ScratchBufferSize too big: %Lu\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)ScratchBufferSize
));
return RETURN_BAD_BUFFER_SIZE;
@@ -192,7 +192,7 @@ QemuFwCfgS3CallWhenBootScriptReady ( DEBUG_ERROR,
"%a: %a: AllocateReservedPool(): out of resources\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
return RETURN_OUT_OF_RESOURCES;
}
@@ -215,7 +215,7 @@ QemuFwCfgS3CallWhenBootScriptReady ( DEBUG_ERROR,
"%a: %a: CreateEvent(): %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
goto FreeDmaAccess;
@@ -231,7 +231,7 @@ QemuFwCfgS3CallWhenBootScriptReady ( DEBUG_ERROR,
"%a: %a: RegisterProtocolNotify(): %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
goto CloseEvent;
@@ -256,7 +256,7 @@ QemuFwCfgS3CallWhenBootScriptReady ( DEBUG_ERROR,
"%a: %a: SignalEvent(): %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
goto NullGlobals;
@@ -383,7 +383,7 @@ QemuFwCfgS3ScriptWriteBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -409,7 +409,7 @@ QemuFwCfgS3ScriptWriteBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -436,7 +436,7 @@ QemuFwCfgS3ScriptWriteBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -544,7 +544,7 @@ QemuFwCfgS3ScriptReadBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -570,7 +570,7 @@ QemuFwCfgS3ScriptReadBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -597,7 +597,7 @@ QemuFwCfgS3ScriptReadBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -692,7 +692,7 @@ QemuFwCfgS3ScriptSkipBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_MEM_WRITE_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -718,7 +718,7 @@ QemuFwCfgS3ScriptSkipBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_IO_WRITE_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -745,7 +745,7 @@ QemuFwCfgS3ScriptSkipBytes ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
@@ -877,7 +877,7 @@ QemuFwCfgS3ScriptCheckValue ( DEBUG_ERROR,
"%a: %a: EFI_BOOT_SCRIPT_MEM_POLL_OPCODE: %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
Status
));
return (RETURN_STATUS)Status;
diff --git a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.c b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.c index a31fd0e7bb..ae9d2260d5 100644 --- a/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.c +++ b/OvmfPkg/Library/ResetSystemLib/DxeResetSystemLibMicrovm.c @@ -29,11 +29,11 @@ DxeResetSystemLibMicrovmConstructor ( EFI_STATUS Status;
EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;
- DEBUG ((DEBUG_INFO, "%a: start\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: start\n", __func__));
Status = gDS->GetMemorySpaceDescriptor (Address, &Descriptor);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_INFO, "%a: GetMemorySpaceDescriptor failed\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: GetMemorySpaceDescriptor failed\n", __func__));
return RETURN_UNSUPPORTED;
}
@@ -43,10 +43,10 @@ DxeResetSystemLibMicrovmConstructor ( Descriptor.Attributes | EFI_MEMORY_RUNTIME
);
if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_INFO, "%a: SetMemorySpaceAttributes failed\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: SetMemorySpaceAttributes failed\n", __func__));
return RETURN_UNSUPPORTED;
}
- DEBUG ((DEBUG_INFO, "%a: done\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: done\n", __func__));
return EFI_SUCCESS;
}
diff --git a/OvmfPkg/Library/ResetSystemLib/ResetSystemLibMicrovm.c b/OvmfPkg/Library/ResetSystemLib/ResetSystemLibMicrovm.c index 44fe929e93..4a4e78cca4 100644 --- a/OvmfPkg/Library/ResetSystemLib/ResetSystemLibMicrovm.c +++ b/OvmfPkg/Library/ResetSystemLib/ResetSystemLibMicrovm.c @@ -25,9 +25,9 @@ MicrovmGedBase ( if (EfiGoneVirtual ()) {
EfiConvertPointer (0, &Address);
- DEBUG ((DEBUG_INFO, "%a: virtual -> 0x%x\n", __FUNCTION__, Address));
+ DEBUG ((DEBUG_INFO, "%a: virtual -> 0x%x\n", __func__, Address));
} else {
- DEBUG ((DEBUG_INFO, "%a: physical -> 0x%x\n", __FUNCTION__, Address));
+ DEBUG ((DEBUG_INFO, "%a: physical -> 0x%x\n", __func__, Address));
}
return (UINTN)Address;
@@ -40,7 +40,7 @@ MicrovmReset ( {
UINTN Address = MicrovmGedBase ();
- DEBUG ((DEBUG_INFO, "%a: microvm reset via ged\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: microvm reset via ged\n", __func__));
MmioWrite8 (
Address + MICROVM_ACPI_GED_REG_RESET,
MICROVM_ACPI_GED_RESET_VALUE
@@ -55,7 +55,7 @@ MicrovmShutdown ( {
UINTN Address = MicrovmGedBase ();
- DEBUG ((DEBUG_INFO, "%a: microvm poweroff via ged\n", __FUNCTION__));
+ DEBUG ((DEBUG_INFO, "%a: microvm poweroff via ged\n", __func__));
MmioWrite8 (
Address + MICROVM_ACPI_GED_REG_SLEEP_CTL,
(1 << 5) /* enable bit */ |
diff --git a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c index c70b4556b7..8df82e161a 100644 --- a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c +++ b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c @@ -294,7 +294,7 @@ IterateVariablesCallbackSetSystemVariable ( DEBUG_WARN,
"%a: setting authenticated variable \"%s\" "
"failed with EFI_SECURITY_VIOLATION, ignoring\n",
- __FUNCTION__,
+ __func__,
VariableName
));
Status = EFI_SUCCESS;
@@ -303,7 +303,7 @@ IterateVariablesCallbackSetSystemVariable ( DEBUG_WARN,
"%a: setting ReadOnly variable \"%s\" "
"failed with EFI_WRITE_PROTECTED, ignoring\n",
- __FUNCTION__,
+ __func__,
VariableName
));
Status = EFI_SUCCESS;
diff --git a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c index 69c2d36400..5de3022086 100644 --- a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c +++ b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c @@ -98,7 +98,7 @@ DetectSmbiosVersion ( DEBUG ((
DEBUG_INFO,
"%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n",
- __FUNCTION__,
+ __func__,
QemuAnchor.V3.DocRev
));
PcdStatus = PcdSet8S (PcdSmbiosDocRev, QemuAnchor.V3.DocRev);
@@ -112,7 +112,7 @@ DetectSmbiosVersion ( DEBUG ((
DEBUG_INFO,
"%a: SMBIOS version from QEMU: 0x%04x\n",
- __FUNCTION__,
+ __func__,
SmbiosVersion
));
PcdStatus = PcdSet16S (PcdSmbiosVersion, SmbiosVersion);
diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c index a1dd10c9f2..a009123dae 100644 --- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c +++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c @@ -220,7 +220,7 @@ InitCpuHotEjectData ( RETURN_ERROR (SafeUintnAdd (Size, sizeof (*mCpuHotEjectData), &Size)) ||
RETURN_ERROR (SafeUintnAdd (Size, sizeof (UINT64) - 1, &Size)))
{
- DEBUG ((DEBUG_ERROR, "%a: invalid CPU_HOT_EJECT_DATA\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: invalid CPU_HOT_EJECT_DATA\n", __func__));
goto Fatal;
}
@@ -303,7 +303,7 @@ SmmCpuFeaturesSmmRelocationComplete ( DEBUG ((
DEBUG_ERROR,
"%a: MemEncryptSevSetPageEncMask(): %r\n",
- __FUNCTION__,
+ __func__,
Status
));
ASSERT (FALSE);
diff --git a/OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.c b/OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.c index e22de4f5d4..e4bec93fed 100644 --- a/OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.c +++ b/OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.c @@ -51,7 +51,7 @@ SetCaCerts ( DEBUG_VERBOSE,
"%a:%a: not touching CA cert list\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
return;
}
@@ -83,7 +83,7 @@ SetCaCerts ( DEBUG_ERROR,
"%a:%a: failed to delete %g:\"%s\"\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
&gEfiTlsCaCertificateGuid,
EFI_TLS_CA_CERTIFICATE_VARIABLE
));
@@ -96,7 +96,7 @@ SetCaCerts ( DEBUG_VERBOSE,
"%a:%a: applied empty CA cert list\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
return;
}
@@ -107,7 +107,7 @@ SetCaCerts ( DEBUG_ERROR,
"%a:%a: failed to allocate HttpsCaCerts\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
return;
}
@@ -127,7 +127,7 @@ SetCaCerts ( DEBUG_ERROR,
"%a:%a: failed to set %g:\"%s\": %r\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
&gEfiTlsCaCertificateGuid,
EFI_TLS_CA_CERTIFICATE_VARIABLE,
Status
@@ -139,7 +139,7 @@ SetCaCerts ( DEBUG_VERBOSE,
"%a:%a: stored CA cert list (%Lu byte(s))\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)HttpsCaCertsSize
));
@@ -176,7 +176,7 @@ SetCipherSuites ( DEBUG_VERBOSE,
"%a:%a: not touching cipher suites\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
return;
}
@@ -204,7 +204,7 @@ SetCipherSuites ( DEBUG_ERROR,
"%a:%a: failed to delete %g:\"%s\"\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
&gEdkiiHttpTlsCipherListGuid,
EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE
));
@@ -216,7 +216,7 @@ SetCipherSuites ( DEBUG_ERROR,
"%a:%a: list of cipher suites must not be empty\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
Status = EFI_INVALID_PARAMETER;
goto Done;
@@ -228,7 +228,7 @@ SetCipherSuites ( DEBUG_ERROR,
"%a:%a: failed to allocate HttpsCiphers\n",
gEfiCallerBaseName,
- __FUNCTION__
+ __func__
));
Status = EFI_OUT_OF_RESOURCES;
goto Done;
@@ -249,7 +249,7 @@ SetCipherSuites ( DEBUG_ERROR,
"%a:%a: failed to set %g:\"%s\"\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
&gEdkiiHttpTlsCipherListGuid,
EDKII_HTTP_TLS_CIPHER_LIST_VARIABLE
));
@@ -260,7 +260,7 @@ SetCipherSuites ( DEBUG_VERBOSE,
"%a:%a: stored list of cipher suites (%Lu byte(s))\n",
gEfiCallerBaseName,
- __FUNCTION__,
+ __func__,
(UINT64)HttpsCiphersSize
));
diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c index 831dc1736d..fac3242257 100644 --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c +++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c @@ -85,7 +85,7 @@ VirtioMmioInit ( DEBUG ((
DEBUG_INFO,
"%a virtio 0.9.5, id %d\n",
- __FUNCTION__,
+ __func__,
Device->VirtioDevice.SubSystemDeviceId
));
Device->VirtioDevice.Revision = VIRTIO_SPEC_REVISION (0, 9, 5);
@@ -94,7 +94,7 @@ VirtioMmioInit ( DEBUG ((
DEBUG_INFO,
"%a virtio 1.0, id %d\n",
- __FUNCTION__,
+ __func__,
Device->VirtioDevice.SubSystemDeviceId
));
Device->VirtioDevice.Revision = VIRTIO_SPEC_REVISION (1, 0, 0);
diff --git a/OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c b/OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c index 248a03e8db..a7ab43ca74 100644 --- a/OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c +++ b/OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.c @@ -394,7 +394,7 @@ QemuLoadKernelImage ( DEBUG ((
DEBUG_ERROR,
"%a: QemuLoadLegacyImage(): %r\n",
- __FUNCTION__,
+ __func__,
Status
));
return Status;
@@ -404,7 +404,7 @@ QemuLoadKernelImage ( return EFI_SUCCESS;
default:
- DEBUG ((DEBUG_ERROR, "%a: LoadImage(): %r\n", __FUNCTION__, Status));
+ DEBUG ((DEBUG_ERROR, "%a: LoadImage(): %r\n", __func__, Status));
return Status;
}
@@ -443,7 +443,7 @@ QemuLoadKernelImage ( DEBUG ((
DEBUG_ERROR,
"%a: kernel command line is not NUL-terminated\n",
- __FUNCTION__
+ __func__
));
Status = EFI_PROTOCOL_ERROR;
goto FreeCommandLine;
@@ -492,7 +492,7 @@ QemuLoadKernelImage ( DEBUG ((
DEBUG_INFO,
"%a: command line: \"%s\"\n",
- __FUNCTION__,
+ __func__,
(CHAR16 *)KernelLoadedImage->LoadOptions
));
}
diff --git a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c index caf4a28e1f..db4973406a 100644 --- a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c +++ b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c @@ -91,7 +91,7 @@ XenIoMmioInstall ( &mXenBusRootDevicePathTemplate
);
if (!XenBusDevicePath) {
- DEBUG ((DEBUG_ERROR, "%a: Out of memory\n", __FUNCTION__));
+ DEBUG ((DEBUG_ERROR, "%a: Out of memory\n", __func__));
Status = EFI_OUT_OF_RESOURCES;
goto FreeXenIo;
}
@@ -115,7 +115,7 @@ XenIoMmioInstall ( DEBUG_ERROR,
"%a: Failed to install the EFI_DEVICE_PATH and "
"XENIO_PROTOCOL protocols on handle %p (Status == %r)\n",
- __FUNCTION__,
+ __func__,
OutHandle,
Status
));
|