diff options
author | Laszlo Ersek <lersek@redhat.com> | 2015-07-28 18:33:23 +0000 |
---|---|---|
committer | lersek <lersek@Edk2> | 2015-07-28 18:33:23 +0000 |
commit | 6394c35a7db3d7a7cc68f491179a45fe430a335a (patch) | |
tree | 537f8795716d685c64e7ea96c7455a022e6bf09d /OvmfPkg/Library | |
parent | 00899456b809b7a0809e92d3e020435eece0effd (diff) | |
download | edk2-6394c35a7db3d7a7cc68f491179a45fe430a335a.tar.gz edk2-6394c35a7db3d7a7cc68f491179a45fe430a335a.tar.bz2 edk2-6394c35a7db3d7a7cc68f491179a45fe430a335a.zip |
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
Diffstat (limited to 'OvmfPkg/Library')
-rw-r--r-- | OvmfPkg/Library/LoadLinuxLib/Linux.c | 3 | ||||
-rw-r--r-- | OvmfPkg/Library/LockBoxLib/LockBoxLib.c | 2 | ||||
-rw-r--r-- | OvmfPkg/Library/NvVarsFileLib/FsAccess.c | 8 | ||||
-rw-r--r-- | OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c | 6 | ||||
-rw-r--r-- | OvmfPkg/Library/XenHypercallLib/XenHypercall.c | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/OvmfPkg/Library/LoadLinuxLib/Linux.c b/OvmfPkg/Library/LoadLinuxLib/Linux.c index 353990b980..9c996adfbb 100644 --- a/OvmfPkg/Library/LoadLinuxLib/Linux.c +++ b/OvmfPkg/Library/LoadLinuxLib/Linux.c @@ -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;
}
diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c index af3bb7f46d..89050ac87c 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c +++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c @@ -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;
diff --git a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c b/OvmfPkg/Library/NvVarsFileLib/FsAccess.c index 66b5566c75..5df8de4985 100644 --- a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c +++ b/OvmfPkg/Library/NvVarsFileLib/FsAccess.c @@ -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; diff --git a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c index 19569b2ae0..6822c5c725 100644 --- a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c +++ b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c @@ -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; } diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c b/OvmfPkg/Library/XenHypercallLib/XenHypercall.c index ecc757cf70..82cdbd9bdb 100644 --- a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c +++ b/OvmfPkg/Library/XenHypercallLib/XenHypercall.c @@ -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;
|