Changeset 16335 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Jan 28, 2009 8:41:30 PM (16 years ago)

Author:

vboxsync

Message:

SUPLib-darwin: io_connect_t isn't a pointer actually, but a natural, so use uintptr_t instead of void * in the struct.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLibInternal.h (modified) (1 diff)
• darwin/SUPLib-darwin.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -195 +195 @@
 #if   defined(RT_OS_DARWIN)
     /** The connection to the VBoxSupDrv service. */
-    void               *pvConnection;
+    uintptr_t           uConnection;
 #elif defined(RT_OS_LINUX)
     /** Indicates whether madvise(,,MADV_DONTFORK) works. */

trunk/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp

@@ -177 +177 @@
     {
         LogRel(("SUP: IOServiceOpen returned %d. Driver open failed.\n", kr));
-        pThis->pvConnection = NULL;
+        pThis->uConnection = 0;
         return VERR_VM_DRIVER_OPEN_ERROR;
     }
 
-    AssertCompile(sizeof(void *) == sizeof(Connection));
-    pThis->pvConnection = (void *)Connection;
+    AssertCompile(sizeof(pThis->uConnection) >= sizeof(Connection));
+    pThis->uConnection = Connection;
     return VINF_SUCCESS;
 }
@@ -205 +205 @@
         if (RT_FAILURE(rc))
         {
-            kern_return_t kr = IOServiceClose((io_connect_t)pThis->pvConnection);
+            kern_return_t kr = IOServiceClose((io_connect_t)pThis->uConnection);
             if (kr != kIOReturnSuccess)
             {
-                LogRel(("Warning: IOServiceClose(%p) returned %d\n", pThis->pvConnection, kr));
+                LogRel(("Warning: IOServiceClose(%RCv) returned %d\n", pThis->uConnection, kr));
                 AssertFailed();
             }
-            pThis->pvConnection = NULL;
+            pThis->uConnection = 0;
         }
     }
@@ -227 +227 @@
      * This will cause the SUPDRVSESSION to be closed (starting IOC 9.1).
      */
-    if (pThis->pvConnection)
-    {
-        kern_return_t kr = IOServiceClose((io_connect_t)pThis->pvConnection);
+    if (pThis->uConnection)
+    {
+        kern_return_t kr = IOServiceClose((io_connect_t)pThis->uConnection);
         if (kr != kIOReturnSuccess)
         {
-            LogRel(("Warning: IOServiceClose(%p) returned %d\n", pThis->pvConnection, kr));
+            LogRel(("Warning: IOServiceClose(%RCv) returned %d\n", pThis->uConnection, kr));
             AssertFailed();
         }
-        pThis->pvConnection = NULL;
+        pThis->uConnection = 0;
     }