Changeset 61771 in vbox

Timestamp:

Jun 20, 2016 4:13:26 PM (9 years ago)

Author:

vboxsync

Message:

VMM/GIM: Cleanup, unused functions and caps.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/GIM.cpp (modified) (8 diffs)
• VMMR3/GIMHv.cpp (modified) (10 diffs)
• include/GIMInternal.h (modified) (1 diff)

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

@@ -429 +429 @@
  * @thread  EMT.
  */
-VMMR3_INT_DECL(int) GIMR3DebugRead(PVM pVM, void *pvRead, size_t *pcbRead, PFNGIMDEBUGBUFREADCOMPLETED pfnReadComplete)
+VMMR3_INT_DECL(int) gimR3DebugRead(PVM pVM, void *pvRead, size_t *pcbRead, PFNGIMDEBUGBUFREADCOMPLETED pfnReadComplete)
 {
     PGIMDEBUG pDbg = pVM->gim.s.pDbgR3;
@@ -466 +466 @@
  * @thread  EMT.
  */
-VMMR3_INT_DECL(int) GIMR3DebugWrite(PVM pVM, void *pvWrite, size_t *pcbWrite)
+VMMR3_INT_DECL(int) gimR3DebugWrite(PVM pVM, void *pvWrite, size_t *pcbWrite)
 {
     PGIMDEBUG pDbg = pVM->gim.s.pDbgR3;
@@ -521 +521 @@
 
 /**
+ * @callback_method_impl{FNPGMPHYSHANDLER,
+ *      Write access handler for mapped MMIO2 pages.  Currently ignores writes.}
+ *
+ * @todo In the future we might want to let the GIM provider decide what the
+ *       handler should do (like throwing \#GP faults).
+ */
+static DECLCALLBACK(VBOXSTRICTRC) gimR3Mmio2WriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf,
+                                                         size_t cbBuf, PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin,
+                                                         void *pvUser)
+{
+    /*
+     * Ignore writes to the mapped MMIO2 page.
+     */
+    Assert(enmAccessType == PGMACCESSTYPE_WRITE);
+    return VINF_SUCCESS;        /** @todo Hyper-V says we should \#GP(0) fault for writes to the Hypercall and TSC page. */
+}
+
+
+#if 0
+/**
  * Unmaps a registered MMIO2 region in the guest address space and removes any
  * access handlers for it.
@@ -528 +548 @@
  * @param   pRegion     Pointer to the GIM MMIO2 region.
  */
-VMMR3_INT_DECL(int) GIMR3Mmio2Unmap(PVM pVM, PGIMMMIO2REGION pRegion)
+VMMR3_INT_DECL(int) gimR3Mmio2Unmap(PVM pVM, PGIMMMIO2REGION pRegion)
 {
     AssertPtr(pVM);
@@ -548 +568 @@
     }
     return VINF_SUCCESS;
-}
-
-
-/**
- * @callback_method_impl{FNPGMPHYSHANDLER,
- *      Write access handler for mapped MMIO2 pages.  Currently ignores writes.}
- *
- * @todo In the future we might want to let the GIM provider decide what the
- *       handler should do (like throwing \#GP faults).
- */
-static DECLCALLBACK(VBOXSTRICTRC)
-gimR3Mmio2WriteHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
-                       PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser)
-{
-    /*
-     * Ignore writes to the mapped MMIO2 page.
-     */
-    Assert(enmAccessType == PGMACCESSTYPE_WRITE);
-    return VINF_SUCCESS;        /** @todo Hyper-V says we should \#GP(0) fault for writes to the Hypercall and TSC page. */
 }
 
@@ -644 +645 @@
 }
 
-#if 0
+
 /**
  * Registers the physical handler for the registered and mapped MMIO2 region.
@@ -652 +653 @@
  * @param   pRegion     Pointer to the GIM MMIO2 region.
  */
-VMMR3_INT_DECL(int) GIMR3Mmio2HandlerPhysicalRegister(PVM pVM, PGIMMMIO2REGION pRegion)
+VMMR3_INT_DECL(int) gimR3Mmio2HandlerPhysicalRegister(PVM pVM, PGIMMMIO2REGION pRegion)
 {
     AssertPtr(pRegion);
@@ -675 +676 @@
  * @param   pRegion     Pointer to the GIM MMIO2 region.
  */
-VMMR3_INT_DECL(int) GIMR3Mmio2HandlerPhysicalDeregister(PVM pVM, PGIMMMIO2REGION pRegion)
+VMMR3_INT_DECL(int) gimR3Mmio2HandlerPhysicalDeregister(PVM pVM, PGIMMMIO2REGION pRegion)
 {
     return PGMHandlerPhysicalDeregister(pVM, pRegion->GCPhysPage);

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

@@ -530 +530 @@
         PGIMMMIO2REGION pRegion = &pHv->aMmio2Regions[i];
 #if 0
-        GIMR3Mmio2Unmap(pVM, pRegion);
+        gimR3Mmio2Unmap(pVM, pRegion);
 #else
         pRegion->fMapped    = false;
@@ -910 +910 @@
      *               rewrite guest memory directly. */
 #if 0
-    rc = GIMR3Mmio2Map(pVM, pRegion, GCPhysTscPage);
+    rc = gimR3Mmio2Map(pVM, pRegion, GCPhysTscPage);
     if (RT_SUCCESS(rc))
     {
@@ -942 +942 @@
     }
     else
-        LogRelFunc(("GIMR3Mmio2Map failed. rc=%Rrc\n", rc));
+        LogRelFunc(("gimR3Mmio2Map failed. rc=%Rrc\n", rc));
     return VERR_GIM_OPERATION_FAILED;
 #else
@@ -997 +997 @@
     {
 #if 0
-        GIMR3Mmio2Unmap(pVM, pRegion);
+        gimR3Mmio2Unmap(pVM, pRegion);
         Assert(!pRegion->fMapped);
 #else
@@ -1023 +1023 @@
     {
 #if 0
-        GIMR3Mmio2Unmap(pVM, pRegion);
+        gimR3Mmio2Unmap(pVM, pRegion);
         Assert(!pRegion->fMapped);
 #else
@@ -1072 +1072 @@
      *               rewrite guest memory directly. */
 #if 0
-    int rc = GIMR3Mmio2Map(pVM, pRegion, GCPhysHypercallPage);
+    int rc = gimR3Mmio2Map(pVM, pRegion, GCPhysHypercallPage);
     if (RT_SUCCESS(rc))
     {
@@ -1104 +1104 @@
         }
 
-        GIMR3Mmio2Unmap(pVM, pRegion);
-    }
-
-    LogRel(("GIM: HyperV: GIMR3Mmio2Map failed. rc=%Rrc\n", rc));
+        gimR3Mmio2Unmap(pVM, pRegion);
+    }
+
+    LogRel(("GIM: HyperV: gimR3Mmio2Map failed. rc=%Rrc\n", rc));
     return rc;
 #else
@@ -1256 +1256 @@
          */
         size_t cbReallyRead = cbRead;
-        rc = GIMR3DebugRead(pVM, pvBuf, &cbReallyRead, gimR3HvDebugBufReadCompleted);
+        rc = gimR3DebugRead(pVM, pvBuf, &cbReallyRead, gimR3HvDebugBufReadCompleted);
         *pcbRead = (uint32_t)cbReallyRead;
     }
@@ -1271 +1271 @@
             {
                 size_t cbReallyRead = cbRead;
-                rc = GIMR3DebugRead(pVM, pvBuf, &cbReallyRead, gimR3HvDebugBufReadCompleted);
+                rc = gimR3DebugRead(pVM, pvBuf, &cbReallyRead, gimR3HvDebugBufReadCompleted);
                 if (   RT_SUCCESS(rc)
                     && cbReallyRead > 0)
@@ -1634 +1634 @@
         AssertCompile(sizeof(size_t) >= sizeof(uint32_t));
         size_t cbWriteBuf = cbWrite;
-        int rc = GIMR3DebugWrite(pVM, pbData, &cbWriteBuf);
+        int rc = gimR3DebugWrite(pVM, pbData, &cbWriteBuf);
         if (   RT_SUCCESS(rc)
             && cbWriteBuf == cbWrite)

trunk/src/VBox/VMM/include/GIMInternal.h

@@ -102 +102 @@
 
 #ifdef IN_RING3
-VMMR3_INT_DECL(int)           GIMR3Mmio2Unmap(PVM pVM, PGIMMMIO2REGION pRegion);
-VMMR3_INT_DECL(int)           GIMR3Mmio2Map(PVM pVM, PGIMMMIO2REGION pRegion, RTGCPHYS GCPhysRegion);
-VMMR3_INT_DECL(int)           GIMR3Mmio2HandlerPhysicalRegister(PVM pVM, PGIMMMIO2REGION pRegion);
-VMMR3_INT_DECL(int)           GIMR3Mmio2HandlerPhysicalDeregister(PVM pVM, PGIMMMIO2REGION pRegion);
+#if 0
+VMMR3_INT_DECL(int)           gimR3Mmio2Unmap(PVM pVM, PGIMMMIO2REGION pRegion);
+VMMR3_INT_DECL(int)           gimR3Mmio2Map(PVM pVM, PGIMMMIO2REGION pRegion, RTGCPHYS GCPhysRegion);
+VMMR3_INT_DECL(int)           gimR3Mmio2HandlerPhysicalRegister(PVM pVM, PGIMMMIO2REGION pRegion);
+VMMR3_INT_DECL(int)           gimR3Mmio2HandlerPhysicalDeregister(PVM pVM, PGIMMMIO2REGION pRegion);
+#endif
 
-VMMR3_INT_DECL(int)           GIMR3DebugRead(PVM pVM, void *pvRead, size_t *pcbRead, PFNGIMDEBUGBUFREADCOMPLETED pfnReadComplete);
-VMMR3_INT_DECL(int)           GIMR3DebugWrite(PVM pVM, void *pvWrite, size_t *pcbWrite);
+VMMR3_INT_DECL(int)           gimR3DebugRead(PVM pVM, void *pvRead, size_t *pcbRead, PFNGIMDEBUGBUFREADCOMPLETED pfnReadComplete);
+VMMR3_INT_DECL(int)           gimR3DebugWrite(PVM pVM, void *pvWrite, size_t *pcbWrite);
 #endif /* IN_RING3 */