tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg: fix conversion specifiers in DEBUG format strings 

Cc: Scott Duplichan <scott@notabs.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Reported-by: Scott Duplichan <scott@notabs.org>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Build-tested-by: Scott Duplichan <scott@notabs.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18095 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Laszlo Ersek 2015-07-28 18:33:23 +00:00 committed by lersek
parent 00899456b8
commit 6394c35a7d
13 changed files with 52 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c
View File

@ -361,7 +361,8 @@ S3CreateIdentityMappingPageTables (
} else {
TotalPageTableSize = (UINTN)(1 + NumberOfPml4EntriesNeeded);
}
DEBUG ((EFI_D_ERROR, "TotalPageTableSize - %x pages\n", TotalPageTableSize));
DEBUG ((EFI_D_ERROR, "TotalPageTableSize - %Lx pages\n",
(UINT64)TotalPageTableSize));
//
// By architecture only one PageMapLevel4 exists - so lets allocate storage for it.
@ -450,10 +451,14 @@ S3Ready (
AcpiS3Context->S3DebugBufferAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocateMemoryBelow4G (EfiReservedMemoryType, EFI_PAGE_SIZE);
SetMem ((VOID *)(UINTN)AcpiS3Context->S3DebugBufferAddress, EFI_PAGE_SIZE, 0xff);
DEBUG((EFI_D_INFO, "AcpiS3Context: AcpiFacsTable is 0x%8x\n", AcpiS3Context->AcpiFacsTable));
DEBUG((EFI_D_INFO, "AcpiS3Context: IdtrProfile is 0x%8x\n", AcpiS3Context->IdtrProfile));
DEBUG((EFI_D_INFO, "AcpiS3Context: S3NvsPageTableAddress is 0x%8x\n", AcpiS3Context->S3NvsPageTableAddress));
DEBUG((EFI_D_INFO, "AcpiS3Context: S3DebugBufferAddress is 0x%8x\n", AcpiS3Context->S3DebugBufferAddress));
DEBUG ((EFI_D_INFO, "AcpiS3Context: AcpiFacsTable is 0x%8Lx\n",
AcpiS3Context->AcpiFacsTable));
DEBUG ((EFI_D_INFO, "AcpiS3Context: IdtrProfile is 0x%8Lx\n",
AcpiS3Context->IdtrProfile));
DEBUG ((EFI_D_INFO, "AcpiS3Context: S3NvsPageTableAddress is 0x%8Lx\n",
AcpiS3Context->S3NvsPageTableAddress));
DEBUG ((EFI_D_INFO, "AcpiS3Context: S3DebugBufferAddress is 0x%8Lx\n",
AcpiS3Context->S3DebugBufferAddress));
Status = SaveLockBox (
&gEfiAcpiVariableGuid,

8
OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.c
View File

@ -187,7 +187,8 @@ BlockIoReadBlocks (
OUT VOID *Buffer
)
{
DEBUG ((EFI_D_INFO, "BlockIo (MMIO) ReadBlocks: lba=0x%lx, size=0x%x\n", Lba, BufferSize));
DEBUG ((EFI_D_INFO, "BlockIo (MMIO) ReadBlocks: lba=0x%Lx, size=0x%Lx\n",
Lba, (UINT64)BufferSize));
return ReadOrWriteBlocks (
This,
TRUE,
@ -234,7 +235,8 @@ BlockIoWriteBlocks (
IN VOID *Buffer
)
{
DEBUG ((EFI_D_INFO, "BlockIo (MMIO) WriteBlocks: lba=0x%lx, size=0x%x\n", Lba, BufferSize));
DEBUG ((EFI_D_INFO, "BlockIo (MMIO) WriteBlocks: lba=0x%Lx, size=0x%Lx\n",
Lba, (UINT64)BufferSize));
return ReadOrWriteBlocks (
This,
FALSE,
@ -309,7 +311,7 @@ BlockIoInit (
DEBUG ((EFI_D_ERROR, "BlockIoInit: OpenBlockMmioProtocol By Driver (%r)\n", Status));
goto ON_ERROR;
}
DEBUG ((EFI_D_INFO, "BlockMmio: 0x%x\n", BlockMmio));
DEBUG ((EFI_D_INFO, "BlockMmio: %p\n", BlockMmio));
DEBUG ((EFI_D_INFO, "BlockMmio->Media->LastBlock: 0x%lx\n", BlockMmio->Media->LastBlock));
Private->Signature = BLOCK_MMIO_TO_BLOCK_IO_SIGNATURE;

3
OvmfPkg/Library/LoadLinuxLib/Linux.c
View File

@ -143,7 +143,8 @@ LoadLinuxInitializeKernelSetup (
//
ZeroMem (KernelSetup, 0x1f1);
ZeroMem (((UINT8 *)KernelSetup) + SetupEnd, 4096 - SetupEnd);
DEBUG ((EFI_D_INFO, "Cleared kernel setup 0-0x1f1, 0x%x-0x1000\n", SetupEnd));
DEBUG ((EFI_D_INFO, "Cleared kernel setup 0-0x1f1, 0x%Lx-0x1000\n",
(UINT64)SetupEnd));
return EFI_SUCCESS;
}

2
OvmfPkg/Library/LockBoxLib/LockBoxLib.c
View File

@ -369,7 +369,7 @@ RestoreAllLockBoxInPlace (
Buffer = (VOID *)(UINTN) Header->OrigAddress;
CopyMem (Buffer, (VOID*)(UINTN)Header->CopyAddress, Header->Size);
DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p\n", __FUNCTION__,
Header->Guid, Buffer));
&Header->Guid, Buffer));
}
}
return RETURN_SUCCESS;

8
OvmfPkg/Library/NvVarsFileLib/FsAccess.c
View File

@ -255,8 +255,8 @@ ReadNvVarsFile (
DEBUG ((
EFI_D_INFO,
"FsAccess.c: Read %d bytes from NV Variables file\n",
FileSize
"FsAccess.c: Read %Lu bytes from NV Variables file\n",
(UINT64)FileSize
));
Status = SerializeVariablesNewInstanceFromBuffer (
@ -369,8 +369,8 @@ LoadNvVarsFromFs (
DEBUG ((
EFI_D_INFO,
"FsAccess.c: Read NV Variables file (size=%d)\n",
Size
"FsAccess.c: Read NV Variables file (size=%Lu)\n",
(UINT64)Size
));
return Status;

6
OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c
View File

@ -218,9 +218,9 @@ IterateVariablesInBuffer (
if (TotalSizeUsed != MaxSize) {
DEBUG ((
EFI_D_ERROR,
"Deserialize variables error: TotalSizeUsed(%d) != MaxSize(%d)\n",
TotalSizeUsed,
MaxSize
"Deserialize variables error: TotalSizeUsed(%Lu) != MaxSize(%Lu)\n",
(UINT64)TotalSizeUsed,
(UINT64)MaxSize
));
return EFI_INVALID_PARAMETER;
}

4
OvmfPkg/Library/XenHypercallLib/XenHypercall.c
View File

@ -35,8 +35,8 @@ XenHypercallHvmGetParam (
HVMOP_get_param, (INTN) &Parameter);
if (Error != 0) {
DEBUG ((EFI_D_ERROR,
"XenHypercall: Error %d trying to get HVM parameter %d\n",
Error, Index));
"XenHypercall: Error %Ld trying to get HVM parameter %d\n",
(INT64)Error, Index));
return 0;
}
return Parameter.value;

2
OvmfPkg/PlatformPei/Platform.c
View File

@ -365,7 +365,7 @@ DebugDumpCmos (
VOID
)
{
UINTN Loop;
UINT32 Loop;
DEBUG ((EFI_D_INFO, "CMOS:\n"));

3
OvmfPkg/QemuVideoDxe/Gop.c
View File

@ -70,7 +70,8 @@ QemuVideoCompleteModeData (
Mode->FrameBufferBase = FrameBufDesc->AddrRangeMin;
Mode->FrameBufferSize = Info->HorizontalResolution * Info->VerticalResolution;
Mode->FrameBufferSize = Mode->FrameBufferSize * ((ModeData->ColorDepth + 7) / 8);
DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%x, FrameBufferSize: 0x%x\n", Mode->FrameBufferBase, Mode->FrameBufferSize));
DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n",
Mode->FrameBufferBase, (UINT64)Mode->FrameBufferSize));
FreePool (FrameBufDesc);
return EFI_SUCCESS;

8
OvmfPkg/Sec/SecMain.c
View File

@ -836,10 +836,10 @@ TemporaryRamMigration (
BASE_LIBRARY_JUMP_BUFFER JumpBuffer;
DEBUG ((EFI_D_INFO,
"TemporaryRamMigration(0x%x, 0x%x, 0x%x)\n",
(UINTN) TemporaryMemoryBase,
(UINTN) PermanentMemoryBase,
CopySize
"TemporaryRamMigration(0x%Lx, 0x%Lx, 0x%Lx)\n",
TemporaryMemoryBase,
PermanentMemoryBase,
(UINT64)CopySize
));
OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;

11
OvmfPkg/XenBusDxe/GrantTable.c
View File

@ -162,7 +162,9 @@ XenGrantTableInit (
Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index;
ReturnCode = XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameters);
if (ReturnCode != 0) {
DEBUG ((EFI_D_ERROR, "Xen GrantTable, add_to_physmap hypercall error: %d\n", ReturnCode));
DEBUG ((EFI_D_ERROR,
"Xen GrantTable, add_to_physmap hypercall error: %Ld\n",
(INT64)ReturnCode));
}
}
}
@ -182,10 +184,13 @@ XenGrantTableDeinit (
for (Index = NR_GRANT_FRAMES - 1; Index >= 0; Index--) {
Parameters.domid = DOMID_SELF;
Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index;
DEBUG ((EFI_D_INFO, "Xen GrantTable, removing %X\n", Parameters.gpfn));
DEBUG ((EFI_D_INFO, "Xen GrantTable, removing %Lx\n",
(UINT64)Parameters.gpfn));
ReturnCode = XenHypercallMemoryOp (XENMEM_remove_from_physmap, &Parameters);
if (ReturnCode != 0) {
DEBUG ((EFI_D_ERROR, "Xen GrantTable, remove_from_physmap hypercall error: %d\n", ReturnCode));
DEBUG ((EFI_D_ERROR,
"Xen GrantTable, remove_from_physmap hypercall error: %Ld\n",
(INT64)ReturnCode));
}
}
GrantTable = NULL;

10
OvmfPkg/XenPvBlkDxe/BlockFront.c
View File

@ -278,7 +278,7 @@ Again:
//
// This is not supported by the driver.
//
DEBUG ((EFI_D_ERROR, "XenPvBlk: Unsupported sector-size value %d, "
DEBUG ((EFI_D_ERROR, "XenPvBlk: Unsupported sector-size value %Lu, "
"it must be a multiple of 512\n", Value));
goto Error2;
}
@ -384,7 +384,7 @@ XenPvBlockFrontShutdown (
break;
}
DEBUG ((EFI_D_INFO,
"XenPvBlk: waiting backend state %d, current: %d\n",
"XenPvBlk: waiting backend state %d, current: %Lu\n",
XenbusStateInitWait, Value));
XenBusIo->WaitForWatch (XenBusIo, Dev->StateWatchToken);
}
@ -596,11 +596,11 @@ XenPvBlockAsyncIoPoll (
if (Status != BLKIF_RSP_OKAY) {
DEBUG ((EFI_D_ERROR,
"XenPvBlk: "
"%a error %d on %a at sector %p, num bytes %p\n",
"%a error %d on %a at sector %Lx, num bytes %Lx\n",
Response->operation == BLKIF_OP_READ ? "read" : "write",
Status, IoData->Dev->NodeName,
IoData->Sector,
IoData->Size));
(UINT64)IoData->Sector,
(UINT64)IoData->Size));
}
for (Index = 0; Index < IoData->NumRef; Index++) {

8
OvmfPkg/XenPvBlkDxe/BlockIo.c
View File

@ -95,14 +95,16 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
}
if (BufferSize % Media->BlockSize != 0) {
DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%X\n", BufferSize));
DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",
(UINT64)BufferSize));
return EFI_BAD_BUFFER_SIZE;
}
if (Lba > Media->LastBlock ||
(BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba) {
DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: %a with invalid LBA: 0x%LX, size: 0x%x\n",
IsWrite ? "Write" : "Read", Lba, BufferSize));
DEBUG ((EFI_D_ERROR,
"XenPvBlkDxe: %a with invalid LBA: 0x%Lx, size: 0x%Lx\n",
IsWrite ? "Write" : "Read", Lba, (UINT64)BufferSize));
return EFI_INVALID_PARAMETER;
}