Changeset 81627 in vbox

Timestamp:

Nov 1, 2019 9:07:06 PM (5 years ago)

Author:

vboxsync

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

134384

Message:

VMMDev: Converted to the new PDM device style. [fixes] bugref:9218

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (4 diffs)
• VMMDevTesting.cpp (modified) (3 diffs)
• VMMDevTesting.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -2542 +2542 @@
     return PGMR3SharedModuleGetPageState(PDMDevHlpGetVM(pDevIns), pReq->GCPtrPage, &pReq->fShared, &pReq->uPageFlags);
 # else
-    RT_NOREF(pThis);
+    RT_NOREF(pDevIns);
     return VERR_NOT_IMPLEMENTED;
 # endif
@@ -4398 +4398 @@
      * Clean up the testing device.
      */
-    vmmdevTestingTerminate(pDevIns);
+    vmmdevR3TestingTerminate(pDevIns);
 #endif
 
@@ -4688 +4688 @@
      * Initialize testing.
      */
-    rc = vmmdevTestingInitialize(pDevIns);
+    rc = vmmdevR3TestingInitialize(pDevIns);
     if (RT_FAILURE(rc))
         return rc;
@@ -4831 +4831 @@
     rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortFast, vmmdevFastRequestHandler, vmmdevFastRequestIrqAck, NULL);
     AssertRCReturn(rc, rc);
+
+# ifndef VBOX_WITHOUT_TESTING_FEATURES
+    /*
+     * Initialize testing.
+     */
+    rc = vmmdevRZTestingInitialize(pDevIns);
+    AssertRCReturn(rc, rc);
+# endif
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp

@@ -685 +685 @@
  * @param   pDevIns             The VMMDev device instance.
  */
-void vmmdevTestingTerminate(PPDMDEVINS pDevIns)
+void vmmdevR3TestingTerminate(PPDMDEVINS pDevIns)
 {
     PVMMDEV   pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
@@ -707 +707 @@
  * @param   pDevIns             The VMMDev device instance.
  */
-int vmmdevTestingInitialize(PPDMDEVINS pDevIns)
+int vmmdevR3TestingInitialize(PPDMDEVINS pDevIns)
 {
     PVMMDEV     pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
@@ -749 +749 @@
 }
 
-#endif /* IN_RING3 */
+#else  /* !IN_RING3 */
+
+/**
+ * Does the ring-0/raw-mode initialization of the testing part if enabled.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns             The VMMDev device instance.
+ */
+int vmmdevRZTestingInitialize(PPDMDEVINS pDevIns)
+{
+    PVMMDEV     pThis   = PDMDEVINS_2_DATA(pDevIns, PVMMDEV);
+    int         rc;
+
+    if (!pThis->fTestingEnabled)
+        return VINF_SUCCESS;
+
+    if (pThis->fTestingMMIO)
+    {
+        rc = PDMDevHlpMmioSetUpContext(pDevIns, pThis->hMmioTesting, vmmdevTestingMmioWrite, vmmdevTestingMmioRead, NULL);
+        AssertRCReturn(rc, rc);
+    }
+
+    rc = PDMDevHlpIoPortSetUpContext(pDevIns, pThis->hIoPortTesting, vmmdevTestingIoWrite, vmmdevTestingIoRead, NULL);
+    AssertRCReturn(rc, rc);
+
+    return VINF_SUCCESS;
+}
+
+#endif /* !IN_RING3 */
 #endif /* !VBOX_WITHOUT_TESTING_FEATURES */
 

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.h

@@ -27 +27 @@
 RT_C_DECLS_BEGIN
 
-int  vmmdevTestingInitialize(PPDMDEVINS pDevIns);
-void vmmdevTestingTerminate(PPDMDEVINS pDevIns);
+int  vmmdevR3TestingInitialize(PPDMDEVINS pDevIns);
+void vmmdevR3TestingTerminate(PPDMDEVINS pDevIns);
+int  vmmdevRZTestingInitialize(PPDMDEVINS pDevIns);
 
 RT_C_DECLS_END