Changeset 15835 in vbox for trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp

Timestamp:

Jan 7, 2009 3:18:17 PM (16 years ago)

Author:

vboxsync

Message:

rtR0MemObjNativeEnterPhys: Use method supporting 64-bit physical addresses. Should fix VERR_ADDRESS_TOO_BIG error (#3485).

File:

• trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp

@@ -405 +405 @@
 {
     /*
-     * Validate the address range and create a descriptor for it.
+     * Create a descriptor for it (the validation is always true on intel macs, but
+     * as it doesn't harm us keep it in).
      */
     int rc = VERR_ADDRESS_TOO_BIG;
-    IOPhysicalAddress PhysAddr = Phys;
-    if (PhysAddr == Phys)
-    {
-        IOMemoryDescriptor *pMemDesc = IOMemoryDescriptor::withPhysicalAddress(PhysAddr, cb, kIODirectionInOut);
+    IOAddressRange aRanges[1] = { Phys, cb };
+    if (    aRanges[0].address == Phys
+        &&  aRanges[0].length == cb)
+    {
+        IOMemoryDescriptor *pMemDesc = IOMemoryDescriptor::withAddressRanges(&aRanges[0], RT_ELEMENTS(aRanges),
+                                                                             kIODirectionInOut, NULL /*task*/);
         if (pMemDesc)
         {
-            Assert(PhysAddr == pMemDesc->getPhysicalAddress());
+            Assert(Phys == pMemDesc->getPhysicalAddress());
 
             /*
@@ -422 +425 @@
             if (pMemDarwin)
             {
-                pMemDarwin->Core.u.Phys.PhysBase = PhysAddr;
+                pMemDarwin->Core.u.Phys.PhysBase = Phys;
                 pMemDarwin->Core.u.Phys.fAllocated = false;
                 pMemDarwin->pMemDesc = pMemDesc;
@@ -432 +435 @@
             pMemDesc->release();
         }
+        else
+            rc = VERR_MEMOBJ_INIT_FAILED;
     }
     else
-        AssertMsgFailed(("%#llx\n", (unsigned long long)Phys));
+        AssertMsgFailed(("%#llx %llx\n", (unsigned long long)Phys, (unsigned long long)cb));
     return rc;
 }