Changeset 46181 in vbox

Timestamp:

May 20, 2013 10:48:52 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85891

Message:

VbglPhysHeapGetPhysAddr returns a 32-bit value, RTCCPHYS causes warnings due to implicit downcasting to smaller type.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp (modified) (4 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -384 +384 @@
  *
  * @param p    Virtual address of memory block.
- * @return Physical memory block.
- */
-DECLVBGL(RTCCPHYS) VbglPhysHeapGetPhysAddr (void *p);
+ * @return Physical address of the memory block.
+ */
+DECLVBGL(uint32_t) VbglPhysHeapGetPhysAddr (void *p);
 
 /**

trunk/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp

@@ -101 +101 @@
 
     /* Physical address of the chunk */
-    RTCCPHYS physAddr;
+    uint32_t physAddr;
 
     /* Number of allocated blocks in the chunk */
@@ -319 +319 @@
     }
 
+    AssertRelease(physAddr < _4G && physAddr + cbSize <= _4G);
+
     pChunk->u32Signature     = VBGL_PH_CHUNKSIGNATURE;
     pChunk->cbSize           = cbSize;
-    pChunk->physAddr         = physAddr;
+    pChunk->physAddr         = (uint32_t)physAddr;
     pChunk->cAllocatedBlocks = 0;
     pChunk->pNext            = g_vbgldata.pChunkHead;
@@ -494 +496 @@
 }
 
-DECLVBGL(RTCCPHYS) VbglPhysHeapGetPhysAddr (void *p)
-{
-    RTCCPHYS physAddr = 0;
+DECLVBGL(uint32_t) VbglPhysHeapGetPhysAddr (void *p)
+{
+    uint32_t physAddr = 0;
     VBGLPHYSHEAPBLOCK *pBlock = vbglPhysHeapData2Block (p);
 
@@ -505 +507 @@
 
         if (pBlock->fu32Flags & VBGL_PH_BF_ALLOCATED)
-            physAddr = pBlock->pChunk->physAddr + ((char *)p - (char *)pBlock->pChunk);
+            physAddr = pBlock->pChunk->physAddr + (uint32_t)((uintptr_t)p - (uintptr_t)pBlock->pChunk);
     }