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

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

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

diff --git a/OvmfPkg/Library/LoadLinuxLib/Linux.c b/OvmfPkg/Library/LoadLinuxLib/Linux.c
index 353990b980c8222a4168c93b1d63cd03684bea6a..9c996adfbb0030c0b776083890b56480a61e6756 100644 (file)
--- a/OvmfPkg/Library/LoadLinuxLib/Linux.c
+++ b/OvmfPkg/Library/LoadLinuxLib/Linux.c
@@ -143,7 +143,8 @@ LoadLinuxInitializeKernelSetup (
   //\r
   ZeroMem (KernelSetup, 0x1f1);\r
   ZeroMem (((UINT8 *)KernelSetup) + SetupEnd, 4096 - SetupEnd);\r
-  DEBUG ((EFI_D_INFO, "Cleared kernel setup 0-0x1f1, 0x%x-0x1000\n", SetupEnd));\r
+  DEBUG ((EFI_D_INFO, "Cleared kernel setup 0-0x1f1, 0x%Lx-0x1000\n",\r
+    (UINT64)SetupEnd));\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
index af3bb7f46deff2f0d751bc4e18051a0a040cf03f..89050ac87cc223a3bd4efbde302c55d01274227e 100644 (file)
--- a/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
+++ b/OvmfPkg/Library/LockBoxLib/LockBoxLib.c
@@ -369,7 +369,7 @@ RestoreAllLockBoxInPlace (
       Buffer = (VOID *)(UINTN) Header->OrigAddress;\r
       CopyMem (Buffer, (VOID*)(UINTN)Header->CopyAddress, Header->Size);\r
       DEBUG ((DEBUG_VERBOSE, "%a: Guid=%g Buffer=%p\n", __FUNCTION__,\r
-        Header->Guid, Buffer));\r
+        &Header->Guid, Buffer));\r
     }\r
   }\r
   return RETURN_SUCCESS;\r

diff --git a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c b/OvmfPkg/Library/NvVarsFileLib/FsAccess.c
index 66b5566c7518f5b09b6d464d6bfec403253e2845..5df8de49855df225cd3a351b7327b4d840fe1f04 100644 (file)
--- 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 19569b2ae0eac711f82a94795f4ed2c28b712143..6822c5c725eeb1db909518ed96196a0cf01d4a62 100644 (file)
--- 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 ecc757cf707cd5044aea5b8c960fdf62970de693..82cdbd9bdb2882c196780742bb333a97328192f2 100644 (file)
--- a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c
+++ b/OvmfPkg/Library/XenHypercallLib/XenHypercall.c
@@ -35,8 +35,8 @@ XenHypercallHvmGetParam (
                          HVMOP_get_param, (INTN) &Parameter);\r
   if (Error != 0) {\r
     DEBUG ((EFI_D_ERROR,\r
-            "XenHypercall: Error %d trying to get HVM parameter %d\n",\r
-            Error, Index));\r
+            "XenHypercall: Error %Ld trying to get HVM parameter %d\n",\r
+            (INT64)Error, Index));\r
     return 0;\r
   }\r
   return Parameter.value;\r

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index fc98fc35e0781a88385ad015b7fcf3cd9f539319..87c51d7a9cc97d5415b12d8d9b250c5fde5fd312 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -365,7 +365,7 @@ DebugDumpCmos (
   VOID\r
   )\r
 {\r
-  UINTN  Loop;\r
+  UINT32 Loop;\r
 \r
   DEBUG ((EFI_D_INFO, "CMOS:\n"));\r
 \r

diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c
index 2ff4bcfeba8d1443469cab32f3f2b6fb6a5a3d64..18d0779896ca494c1765577cfede6ad428710a29 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Gop.c
+++ b/OvmfPkg/QemuVideoDxe/Gop.c
@@ -70,7 +70,8 @@ QemuVideoCompleteModeData (
   Mode->FrameBufferBase = FrameBufDesc->AddrRangeMin;\r
   Mode->FrameBufferSize = Info->HorizontalResolution * Info->VerticalResolution;\r
   Mode->FrameBufferSize = Mode->FrameBufferSize * ((ModeData->ColorDepth + 7) / 8);\r
-  DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%x, FrameBufferSize: 0x%x\n", Mode->FrameBufferBase, Mode->FrameBufferSize));\r
+  DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n",\r
+    Mode->FrameBufferBase, (UINT64)Mode->FrameBufferSize));\r
 \r
   FreePool (FrameBufDesc);\r
   return EFI_SUCCESS;\r

diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
index 670ad8d763aab0dc3a5f8215ee57c96a3cf7c6dd..b7df549f31007afbe3a0cb72e04b5dfaf639632e 100644 (file)
--- a/OvmfPkg/Sec/SecMain.c
+++ b/OvmfPkg/Sec/SecMain.c
@@ -836,10 +836,10 @@ TemporaryRamMigration (
   BASE_LIBRARY_JUMP_BUFFER         JumpBuffer;\r
   \r
   DEBUG ((EFI_D_INFO,\r
-    "TemporaryRamMigration(0x%x, 0x%x, 0x%x)\n",\r
-    (UINTN) TemporaryMemoryBase,\r
-    (UINTN) PermanentMemoryBase,\r
-    CopySize\r
+    "TemporaryRamMigration(0x%Lx, 0x%Lx, 0x%Lx)\n",\r
+    TemporaryMemoryBase,\r
+    PermanentMemoryBase,\r
+    (UINT64)CopySize\r
     ));\r
   \r
   OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;\r

diff --git a/OvmfPkg/XenBusDxe/GrantTable.c b/OvmfPkg/XenBusDxe/GrantTable.c
index 6e47483f136f8217f47b2e9c8394ee8e17a5d9c4..90dec26ab00147bc1788a2b778c238e0073054af 100644 (file)
--- a/OvmfPkg/XenBusDxe/GrantTable.c
+++ b/OvmfPkg/XenBusDxe/GrantTable.c
@@ -162,7 +162,9 @@ XenGrantTableInit (
     Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index;\r
     ReturnCode = XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameters);\r
     if (ReturnCode != 0) {\r
-      DEBUG ((EFI_D_ERROR, "Xen GrantTable, add_to_physmap hypercall error: %d\n", ReturnCode));\r
+      DEBUG ((EFI_D_ERROR,\r
+        "Xen GrantTable, add_to_physmap hypercall error: %Ld\n",\r
+        (INT64)ReturnCode));\r
     }\r
   }\r
 }\r
@@ -182,10 +184,13 @@ XenGrantTableDeinit (
   for (Index = NR_GRANT_FRAMES - 1; Index >= 0; Index--) {\r
     Parameters.domid = DOMID_SELF;\r
     Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index;\r
-    DEBUG ((EFI_D_INFO, "Xen GrantTable, removing %X\n", Parameters.gpfn));\r
+    DEBUG ((EFI_D_INFO, "Xen GrantTable, removing %Lx\n",\r
+      (UINT64)Parameters.gpfn));\r
     ReturnCode = XenHypercallMemoryOp (XENMEM_remove_from_physmap, &Parameters);\r
     if (ReturnCode != 0) {\r
-      DEBUG ((EFI_D_ERROR, "Xen GrantTable, remove_from_physmap hypercall error: %d\n", ReturnCode));\r
+      DEBUG ((EFI_D_ERROR,\r
+        "Xen GrantTable, remove_from_physmap hypercall error: %Ld\n",\r
+        (INT64)ReturnCode));\r
     }\r
   }\r
   GrantTable = NULL;\r

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

diff --git a/OvmfPkg/XenPvBlkDxe/BlockIo.c b/OvmfPkg/XenPvBlkDxe/BlockIo.c
index 7fc7a05b4c23ff2703f65146c103fbff60e546e2..ae6aa62ac0d3bb4e4a9977be502f03e987133d44 100644 (file)
--- a/OvmfPkg/XenPvBlkDxe/BlockIo.c
+++ b/OvmfPkg/XenPvBlkDxe/BlockIo.c
@@ -95,14 +95,16 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
   }\r
 \r
   if (BufferSize % Media->BlockSize != 0) {\r
-    DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%X\n", BufferSize));\r
+    DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",\r
+      (UINT64)BufferSize));\r
     return EFI_BAD_BUFFER_SIZE;\r
   }\r
 \r
   if (Lba > Media->LastBlock ||\r
       (BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba) {\r
-    DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: %a with invalid LBA: 0x%LX, size: 0x%x\n",\r
-            IsWrite ? "Write" : "Read", Lba, BufferSize));\r
+    DEBUG ((EFI_D_ERROR,\r
+      "XenPvBlkDxe: %a with invalid LBA: 0x%Lx, size: 0x%Lx\n",\r
+      IsWrite ? "Write" : "Read", Lba, (UINT64)BufferSize));\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r