MdeModulePkg CapsuleApp: Refine -N option help information

[mirror_edk2.git] / OvmfPkg / XenPvBlkDxe / BlockIo.c

diff --git a/OvmfPkg/XenPvBlkDxe/BlockIo.c b/OvmfPkg/XenPvBlkDxe/BlockIo.c
index 4f3bc53f3e8b2304e6b4c825c5354286ce17df3c..70bf32cab0160c3e57aaa2748a32be5f4aaef8e2 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
@@ -136,7 +138,7 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
   }\r
 \r
   IoData.Dev = XEN_BLOCK_FRONT_FROM_BLOCK_IO (This);\r
-  Sector = Lba * (Media->BlockSize / 512);\r
+  Sector = (UINTN)MultU64x32 (Lba, Media->BlockSize / 512);\r
 \r
   while (BufferSize > 0) {\r
     if (((UINTN)Buffer & EFI_PAGE_MASK) == 0) {\r
@@ -154,7 +156,7 @@ XenPvBlkDxeBlockIoReadWriteBlocks (
     Sector += IoData.Size / 512;\r
     Status = XenPvBlockIo (&IoData, IsWrite);\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Error durring %a operation.\n",\r
+      DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Error during %a operation.\n",\r
               IsWrite ? "write" : "read"));\r
       return Status;\r
     }\r