Changeset 10805

Timestamp:

07/22/08 11:44:31 (3 months ago)

Author:

vboxsync

Message:

VMM+SUPDrv: Changed the VMMR0EntryEx interface to also take the session as an argument, this means breaking the current IOC interface and thus a major driver version change.

Files:

• trunk/include/VBox/vmm.h (modified) (2 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (2 diffs)
• trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h (modified) (1 diff)
• trunk/src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (12 diffs)

trunk/include/VBox/vmm.h

@@ -483 +483 @@
- * @param   enmOperation    Which operation to execute.
- * @param   pvArg           Argument to the operation.
-
+or preemption 
- */
-VMMR0DECL(int) VMMR0EntryInt(PVM pVM, VMMR0OPERATION enmOperation, void *pvArg);
@@ -505 +505 @@
- * @param   pReq            This points to a SUPVMMR0REQHDR packet. Optional.
- * @param   u64Arg          Some simple constant argument.
+ * @param   pSession        The session of the caller.
- * @remarks Assume called with interrupts _enabled_.
- */
-
+, PSUPDRVSESSION
-
-/**

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

@@ -1116 +1116 @@
-                /* execute */
-                if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
-
+, pSession
-                else
-                    pReq->Hdr.rc = VERR_WRONG_ORDER;
@@ -1130 +1130 @@
-                /* execute */
-                if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
-
+, pSession
-                else
-                    pReq->Hdr.rc = VERR_WRONG_ORDER;

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

@@ -182 +182 @@
- * The upper 16-bit is the major version, the the lower the minor version.
- * When incompatible changes are made, the upper major number has to be changed. */
-80001
+90000
-
-/** SUP_IOCTL_COOKIE. */

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

@@ -617 +617 @@
-    DECLR0CALLBACKMEMBER(void, pfnVMMR0EntryFast, (PVM pVM, unsigned uOperation));
-    /** VMMR0EntryEx() pointer. */
-
+, PSUPDRVSESSION pSession
-
-    /** Linked list of loaded code. */

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

@@ -212 +212 @@
-        strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
-        CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
-
+/*
-                                  ? 0x00080001
-
+*/ 
-        CookieReq.u.In.u32MinVersion = MinVersion;
-        rc = suplibOsIOCtl(SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE);

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -668 +668 @@
- * @param   pSession    The session argument.
- */
-
+ClaimedSession, PSUPDRVSESSION p
-{
-    /* Only one out of the two */
@@ -674 +674 @@
-        return false;
-    if (pVM)
-
-
-
-
+
+
-}
-
@@ -691 +689 @@
- *                          The support driver validates this if it's present.
- * @param   u64Arg          Some simple constant argument.
+ * @param   pSession        The session of the caller.
- * @remarks Assume called with interrupts _enabled_.
- */
-
+, PSUPDRVSESSION pSession
-{
-    /*
@@ -883 +882 @@
-        {
-            PINTNETOPENREQ pReq = (PINTNETOPENREQ)pReqHdr;
-
+, pSession
-                return VERR_INVALID_PARAMETER;
-            if (!g_pIntNet)
-                return VERR_NOT_SUPPORTED;
-VM ? pVM->pSession : pReq->p
+
-        }
-
-        case VMMR0_DO_INTNET_IF_CLOSE:
-
+, pSession
-                return VERR_INVALID_PARAMETER;
-            if (!g_pIntNet)
@@ -898 +897 @@
-
-        case VMMR0_DO_INTNET_IF_GET_RING3_BUFFER:
-
+, pSession
-                return VERR_INVALID_PARAMETER;
-            if (!g_pIntNet)
@@ -905 +904 @@
-
-        case VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE:
-
+, pSession
-                return VERR_INVALID_PARAMETER;
-            if (!g_pIntNet)
@@ -912 +911 @@
-
-        case VMMR0_DO_INTNET_IF_SEND:
-
+, pSession
-                return VERR_INVALID_PARAMETER;
-            if (!g_pIntNet)
@@ -919 +918 @@
-
-        case VMMR0_DO_INTNET_IF_WAIT:
-
+, pSession
-                return VERR_INVALID_PARAMETER;
-            if (!g_pIntNet)
@@ -961 +960 @@
-    PSUPVMMR0REQHDR     pReq;
-    uint64_t            u64Arg;
+    PSUPDRVSESSION      pSession;
-} VMMR0ENTRYEXARGS;
-/** Pointer to a vmmR0EntryExWrapper argument package. */
@@ -976 +976 @@
-                              ((PVMMR0ENTRYEXARGS)pvArgs)->enmOperation,
-                              ((PVMMR0ENTRYEXARGS)pvArgs)->pReq,
-
+
+
-}
-
@@ -988 +989 @@
- * @param   pReq            This points to a SUPVMMR0REQHDR packet. Optional.
- * @param   u64Arg          Some simple constant argument.
+ * @param   pSession        The session of the caller.
- * @remarks Assume called with interrupts _enabled_.
- */
-
+, PSUPDRVSESSION pSession
-{
-    /*
@@ -1025 +1027 @@
-        }
-    }
-
+, pSession
-}
-