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

Timestamp:

Apr 11, 2012 11:33:21 PM (13 years ago)

Author:

vboxsync

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

77423

Message:

duh, again.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.d (modified) (1 diff)
• SUPDrvTracer.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.d

@@ -21 +21 @@
     probe session__create(struct SUPDRVSESSION *pSession, int fUser);
     probe session__close(struct SUPDRVSESSION *pSession);
-    probe ioctl__entry(struct SUPDRVSESSION *pSession, unsigned int uIOCtl, void *pvReqHdr);
-    probe ioctl__return(struct SUPDRVSESSION *pSession, unsigned int uIOCtl, void *pvReqHdr, int rc, int rcReq);
+    probe ioctl__entry(struct SUPDRVSESSION *pSession, uintptr_t uIOCtl, void *pvReqHdr);
+    probe ioctl__return(struct SUPDRVSESSION *pSession, uintptr_t uIOCtl, void *pvReqHdr, int rc, int rcReq);
 };
 

trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp

@@ -348 +348 @@
                 return rc;
             }
-            if (VTG_TYPE_IS_LARGE(pArgList->aArgs[iArg].fType))
+            if (VTG_TYPE_IS_LARGE(pArgList->aArgs[iArg].fType) && iArg >= 5)
                 fHaveLargeArgs = true;
         }
         if ((uint8_t)fHaveLargeArgs != pArgList->fHaveLargeArgs)
+        {
+            SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_TRACER_BAD_ARG_FLAGS - fType=%#x iProbe=%u fHaveLargeArgs=%d expected %d\n",
+                        pArgList->aArgs[iArg].fType, i, pArgList->fHaveLargeArgs, fHaveLargeArgs);
             return VERR_SUPDRV_VTG_BAD_PROBE;
+        }
     }