Changeset 45645 in vbox

Timestamp:

Apr 19, 2013 1:46:48 PM (12 years ago)

Author:

vboxsync

Message:

VMM/PDMDevHlp: Add helper to get the SUPDrv session handle (intended for the semaphore API)

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (4 diffs)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (4 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -40 +40 @@
 #include <VBox/err.h>
 #include <VBox/pci.h>
+#include <VBox/sup.h>
 #include <iprt/stdarg.h>
 
@@ -3602 +3603 @@
     DECLR3CALLBACKMEMBER(uint64_t, pfnTMTimeVirtGetNano,(PPDMDEVINS pDevIns));
 
+    /**
+     * Gets the support driver session.
+     *
+     * This is intended for working with the semaphore API.
+     *
+     * @returns Support driver session handle.
+     * @param   pDrvIns         The driver instance.
+     */
+    DECLR3CALLBACKMEMBER(PSUPDRVSESSION, pfnGetSupDrvSession,(PPDMDEVINS pDevIns));
+
     /** @} */
 
@@ -3614 +3625 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE(0xffe7, 11, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE(0xffe7, 12, 0)
 
 
@@ -5190 +5201 @@
 }
 
+/*
+ * @copydoc PDMDEVHLPR3::pfnGetSupDrvSession
+ */
+DECLINLINE(PSUPDRVSESSION) PDMDevHlpGetSupDrvSession(PPDMDEVINS pDevIns)
+{
+    return pDevIns->pHlpR3->pfnGetSupDrvSession(pDevIns);
+}
 #endif /* IN_RING3 */
 #ifdef IN_RING0

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -670 +670 @@
     LogFlow(("pdmR3DevHlp_TMTimeVirtGetNano: caller='%s'/%d: returns %RU64\n", pDevIns->pReg->szName, pDevIns->iInstance, u64Nano));
     return u64Nano;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnGetSupDrvSession} */
+static DECLCALLBACK(PSUPDRVSESSION) pdmR3DevHlp_GetSupDrvSession(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    LogFlow(("pdmR3DevHlp_GetSupDrvSession: caller='%s'\n",
+             pDevIns->pReg->szName, pDevIns->iInstance));
+
+    PSUPDRVSESSION pSession = pDevIns->Internal.s.pVMR3->pSession;
+
+    LogFlow(("pdmR3DevHlp_GetSupDrvSession: caller='%s'/%d: returns %#p\n", pDevIns->pReg->szName, pDevIns->iInstance, pSession));
+    return pSession;
 }
 
@@ -3493 +3507 @@
     pdmR3DevHlp_TMTimeVirtGetFreq,
     pdmR3DevHlp_TMTimeVirtGetNano,
+    pdmR3DevHlp_GetSupDrvSession,
     PDM_DEVHLPR3_VERSION /* the end */
 };
@@ -3607 +3622 @@
     NOREF(iLeaf); NOREF(pEax); NOREF(pEbx); NOREF(pEcx); NOREF(pEdx);
     AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance));
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnGetSupDrvSession} */
+static DECLCALLBACK(PSUPDRVSESSION) pdmR3DevHlp_Untrusted_GetSupDrvSession(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    AssertReleaseMsgFailed(("Untrusted device called trusted helper! '%s'/%d\n", pDevIns->pReg->szName, pDevIns->iInstance));
+    return (PSUPDRVSESSION)0;
 }
 
@@ -3724 +3748 @@
     pdmR3DevHlp_TMTimeVirtGetFreq,
     pdmR3DevHlp_TMTimeVirtGetNano,
+    pdmR3DevHlp_Untrusted_GetSupDrvSession,
     PDM_DEVHLPR3_VERSION /* the end */
 };