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

Timestamp:

May 19, 2012 11:26:39 PM (13 years ago)

Author:

vboxsync

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

78043

Message:

SUPDrv-dtrace.cpp: sigh.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp

@@ -68 +68 @@
 # define intptr_t dtrace_intptr_t
 # include "dtrace.h"
+# define FIX_UEK_RC(a_rc) (-(a_rc))
 #else
 # include <sys/dtrace.h>
+#endif
+
+
+/** 
+ * The UEK DTrace port is trying to be smart and seems to have turned all 
+ * errno return codes negative.  While this conforms to the linux kernel way of
+ * doing things, it breaks with the way the interfaces work on Solaris and 
+ * Mac OS X.
+ */
+#ifndef FIX_UEK_RC
+# define FIX_UEK_RC(a_rc) (a_rc) 
 #endif
 
@@ -925 +937 @@
     {
         pCore->TracerData.DTrace.idProvider = 0;
-        rc = RTErrConvertFromErrno(rc);
+        rc = RTErrConvertFromErrno(FIX_UEK_RC(rc));
     }
 
@@ -951 +963 @@
     else
     {
-        AssertMsg(rc == EBUSY, ("%d\n", rc));
+        AssertMsg(FIX_UEK_RC(rc) == EBUSY, ("%d\n", rc));
         pCore->TracerData.DTrace.fZombie = true;
         rc = VERR_TRY_AGAIN;
@@ -979 +991 @@
     else
     {
-        AssertMsg(rc == EBUSY, ("%d\n", rc));
+        AssertMsg(FIX_UEK_RC(rc) == EBUSY, ("%d\n", rc));
         rc = VERR_TRY_AGAIN;
     }