Changeset 71198 in vbox for trunk/src/VBox/HostDrivers/Support/solaris

Timestamp:

Mar 5, 2018 10:59:17 AM (7 years ago)

Author:

vboxsync

Message:

SUPDrv,VMMR0: Prepped for extending the fast I/O control interface a bit for NEM; SUPDRV version increment. bugref:9044

File:

• trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (4 diffs)

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -664 +664 @@
  *
  * @param   Dev             Device number
- * @param   Cmd             Operation identifier
+ * @param   iCmd            Operation identifier
  * @param   pArgs           Arguments from user to driver
  * @param   Mode            Information bitfield (read/write, address space etc.)
@@ -672 +672 @@
  * @return  corresponding solaris error code.
  */
-static int VBoxDrvSolarisIOCtl(dev_t Dev, int Cmd, intptr_t pArgs, int Mode, cred_t *pCred, int *pVal)
+static int VBoxDrvSolarisIOCtl(dev_t Dev, int iCmd, intptr_t pArgs, int Mode, cred_t *pCred, int *pVal)
 {
 #ifndef USE_SESSION_HASH
@@ -708 +708 @@
     {
         LogRel(("VBoxSupDrvIOCtl: WHAT?!? pSession == NULL! This must be a mistake... pid=%d iCmd=%#x Dev=%#x\n",
-                    (int)Process, Cmd, (int)Dev));
+                    (int)Process, iCmd, (int)Dev));
         return EINVAL;
     }
@@ -717 +717 @@
      * the session and iCmd, and only returns a VBox status code.
      */
-    if (   (   Cmd == SUP_IOCTL_FAST_DO_RAW_RUN
-            || Cmd == SUP_IOCTL_FAST_DO_HM_RUN
-            || Cmd == SUP_IOCTL_FAST_DO_NOP)
+    AssertCompile((SUP_IOCTL_FAST_DO_FIRST & 0xff) == (SUP_IOCTL_FLAG | 64));
+    if (   (unsigned)(iCmd - SUP_IOCTL_FAST_DO_FIRST) < (unsigned)32
         && pSession->fUnrestricted)
     {
-        *pVal = supdrvIOCtlFast(Cmd, pArgs, &g_DevExt, pSession);
+        *pVal = supdrvIOCtlFast(iCmd - SUP_IOCTL_FAST_DO_FIRST, pArgs, &g_DevExt, pSession);
         return 0;
     }
 
-    return VBoxDrvSolarisIOCtlSlow(pSession, Cmd, Mode, pArgs);
+    return VBoxDrvSolarisIOCtlSlow(pSession, iCmd, Mode, pArgs);
 }