Changeset 88075 in vbox

Timestamp:

Mar 10, 2021 7:22:36 PM (4 years ago)

Author:

vboxsync

Message:

Backing out r143016 (doxygen fix) as it needs to be split up.

Location:

trunk/src/VBox

Files:

• Devices/Audio/DevHDA.cpp (modified) (4 diffs)
• Devices/Bus/DevIommuAmd.cpp (modified) (1 diff)
• VMM/VMMAll/PDMAllIommu.cpp (modified) (15 diffs)
• VMM/VMMAll/TMAll.cpp (modified) (1 diff)
• VMM/VMMR0/PDMR0DevHlp.cpp (modified) (2 diffs)
• VMM/VMMR3/PDMDevMiscHlp.cpp (modified) (2 diffs)
• VMM/VMMR3/TM.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/DevHDA.cpp

@@ -2418 +2418 @@
 
 /**
- * @interface_method_impl{HDACODECR3,pfnCbMixerAddStream}
+ * @interface_method_impl{HDACODEC,pfnCbMixerAddStream}
  */
 static DECLCALLBACK(int) hdaR3MixerAddStream(PPDMDEVINS pDevIns, PDMAUDIOMIXERCTL enmMixerCtl, PPDMAUDIOSTREAMCFG pCfg)
@@ -2442 +2442 @@
 
 /**
- * @interface_method_impl{HDACODECR3,pfnCbMixerRemoveStream}
+ * @interface_method_impl{HDACODEC,pfnCbMixerRemoveStream}
  */
 static DECLCALLBACK(int) hdaR3MixerRemoveStream(PPDMDEVINS pDevIns, PDMAUDIOMIXERCTL enmMixerCtl)
@@ -2513 +2513 @@
 
 /**
- * @interface_method_impl{HDACODECR3,pfnCbMixerControl}
+ * @interface_method_impl{HDACODEC,pfnCbMixerControl}
  *
  * @note Is also called directly by the DevHDA code.
@@ -2616 +2616 @@
 
 /**
- * @interface_method_impl{HDACODECR3,pfnCbMixerSetVolume}
+ * @interface_method_impl{HDACODEC,pfnCbMixerSetVolume}
  */
 static DECLCALLBACK(int) hdaR3MixerSetVolume(PPDMDEVINS pDevIns, PDMAUDIOMIXERCTL enmMixerCtl, PPDMAUDIOVOLUME pVol)

trunk/src/VBox/Devices/Bus/DevIommuAmd.cpp

@@ -1239 +1239 @@
  *
  * @param   pThis           The shared IOMMU device state.
- * @param   pThisR3         The ring-3 IOMMU device state.
+ * @param   pThis           The ring-3 IOMMU device state.
  * @param   idDomain        The domain ID.
  * @param   uIova           The I/O virtual address.

trunk/src/VBox/VMM/VMMAll/PDMAllIommu.cpp

@@ -68 +68 @@
 
 /** @copydoc PDMIOMMUREGR3::pfnMsiRemap */
-int pdmIommuMsiRemap(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
-{
-    PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
-    PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
-    if (   pDevInsIommu
-        && pDevInsIommu != pDevIns)
-    {
-        int rc = pIommu->pfnMsiRemap(pDevInsIommu, idDevice, pMsiIn, pMsiOut);
+int pdmIommuMsiRemap(PPDMDEVINS pDevIns, uint16_t uDeviceId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
+{
+    PPDMIOMMU  pIommu       = PDMDEVINS_TO_IOMMU(pDevIns);
+    PPDMDEVINS pDevInsIommu = pIommu->CTX_SUFF(pDevIns);
+    if (   pDevInsIommu
+        && pDevInsIommu != pDevIns)
+    {
+        int rc = pIommu->pfnMsiRemap(pDevInsIommu, uDeviceId, pMsiIn, pMsiOut);
         if (RT_FAILURE(rc))
         {
-            LogFunc(("MSI remap failed. idDevice=%#x pMsiIn=(%#RX64, %#RU32) rc=%Rrc\n", idDevice, pMsiIn->Addr.u64,
+            LogFunc(("MSI remap failed. uDeviceId=%#x pMsiIn=(%#RX64, %#RU32) rc=%Rrc\n", uDeviceId, pMsiIn->Addr.u64,
                      pMsiIn->Data.u32, rc));
         }
@@ -110 +110 @@
         && pDevInsIommu != pDevIns)
     {
-        uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
+        uint16_t const uDeviceId = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         int rc = VINF_SUCCESS;
         while (cbRead > 0)
@@ -116 +116 @@
             RTGCPHYS GCPhysOut;
             size_t   cbContig;
-            rc = pIommu->pfnMemAccess(pDevInsIommu, idDevice, GCPhys, cbRead, PDMIOMMU_MEM_F_READ, &GCPhysOut, &cbContig);
+            rc = pIommu->pfnMemAccess(pDevInsIommu, uDeviceId, GCPhys, cbRead, PDMIOMMU_MEM_F_READ, &GCPhysOut, &cbContig);
             if (RT_SUCCESS(rc))
             {
@@ -133 +133 @@
             else
             {
-                LogFunc(("IOMMU memory read failed. idDevice=%#x GCPhys=%#RGp cb=%zu rc=%Rrc\n", idDevice, GCPhys, cbRead, rc));
+                LogFunc(("IOMMU memory read failed. uDeviceId=%#x GCPhys=%#RGp cb=%zu rc=%Rrc\n", uDeviceId, GCPhys, cbRead, rc));
 
                 /*
@@ -174 +174 @@
         && pDevInsIommu != pDevIns)
     {
-        uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
+        uint16_t const uDeviceId = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         int rc = VINF_SUCCESS;
         while (cbWrite > 0)
@@ -180 +180 @@
             RTGCPHYS GCPhysOut;
             size_t   cbContig;
-            rc = pIommu->pfnMemAccess(pDevInsIommu, idDevice, GCPhys, cbWrite, PDMIOMMU_MEM_F_WRITE, &GCPhysOut, &cbContig);
+            rc = pIommu->pfnMemAccess(pDevInsIommu, uDeviceId, GCPhys, cbWrite, PDMIOMMU_MEM_F_WRITE, &GCPhysOut, &cbContig);
             if (RT_SUCCESS(rc))
             {
@@ -197 +197 @@
             else
             {
-                LogFunc(("IOMMU memory write failed. idDevice=%#x GCPhys=%#RGp cb=%zu rc=%Rrc\n", idDevice, GCPhys, cbWrite,
+                LogFunc(("IOMMU memory write failed. uDeviceId=%#x GCPhys=%#RGp cb=%zu rc=%Rrc\n", uDeviceId, GCPhys, cbWrite,
                          rc));
                 break;
@@ -235 +235 @@
         && pDevInsIommu != pDevIns)
     {
-        uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
+        uint16_t const uDeviceId = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         size_t   cbContig  = 0;
         RTGCPHYS GCPhysOut = NIL_RTGCPHYS;
-        int rc = pIommu->pfnMemAccess(pDevInsIommu, idDevice, GCPhys & X86_PAGE_BASE_MASK, X86_PAGE_SIZE, PDMIOMMU_MEM_F_READ,
+        int rc = pIommu->pfnMemAccess(pDevInsIommu, uDeviceId, GCPhys & X86_PAGE_BASE_MASK, X86_PAGE_SIZE, PDMIOMMU_MEM_F_READ,
                                       &GCPhysOut, &cbContig);
         if (RT_SUCCESS(rc))
@@ -247 +247 @@
         }
 
-        LogFunc(("IOMMU memory read for pointer access failed. idDevice=%#x GCPhys=%#RGp rc=%Rrc\n", idDevice, GCPhys, rc));
+        LogFunc(("IOMMU memory read for pointer access failed. uDeviceId=%#x GCPhys=%#RGp rc=%Rrc\n", uDeviceId, GCPhys, rc));
         return rc;
     }
@@ -280 +280 @@
         && pDevInsIommu != pDevIns)
     {
-        uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
+        uint16_t const uDeviceId = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         size_t   cbContig  = 0;
         RTGCPHYS GCPhysOut = NIL_RTGCPHYS;
-        int rc = pIommu->pfnMemAccess(pDevInsIommu, idDevice, GCPhys & X86_PAGE_BASE_MASK, X86_PAGE_SIZE, PDMIOMMU_MEM_F_WRITE,
+        int rc = pIommu->pfnMemAccess(pDevInsIommu, uDeviceId, GCPhys & X86_PAGE_BASE_MASK, X86_PAGE_SIZE, PDMIOMMU_MEM_F_WRITE,
                                       &GCPhysOut, &cbContig);
         if (RT_SUCCESS(rc))
@@ -292 +292 @@
         }
 
-        LogFunc(("IOMMU memory write for pointer access failed. idDevice=%#x GCPhys=%#RGp rc=%Rrc\n", idDevice, GCPhys, rc));
+        LogFunc(("IOMMU memory write for pointer access failed. uDeviceId=%#x GCPhys=%#RGp rc=%Rrc\n", uDeviceId, GCPhys, rc));
         return rc;
     }
@@ -341 +341 @@
 
         /* Ask the IOMMU for corresponding translated physical addresses. */
-        uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
+        uint16_t const uDeviceId = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         AssertCompile(sizeof(RTGCPHYS) == sizeof(uint64_t));
-        int rc = pIommu->pfnMemBulkAccess(pDevInsIommu, idDevice, cPages, (uint64_t const *)paGCPhysPages, PDMIOMMU_MEM_F_READ,
+        int rc = pIommu->pfnMemBulkAccess(pDevInsIommu, uDeviceId, cPages, (uint64_t const *)paGCPhysPages, PDMIOMMU_MEM_F_READ,
                                           paGCPhysOut);
         if (RT_SUCCESS(rc))
@@ -353 +353 @@
         }
         else
-            LogFunc(("Bulk translation for read access failed. idDevice=%#x cPages=%zu rc=%Rrc\n", idDevice, cPages, rc));
+            LogFunc(("Bulk translation for read access failed. uDeviceId=%#x cPages=%zu rc=%Rrc\n", uDeviceId, cPages, rc));
 
         RTMemFree(paGCPhysOut);
@@ -404 +404 @@
 
         /* Ask the IOMMU for corresponding translated physical addresses. */
-        uint16_t const idDevice = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
+        uint16_t const uDeviceId = pdmIommuGetPciDeviceId(pDevIns, pPciDev);
         AssertCompile(sizeof(RTGCPHYS) == sizeof(uint64_t));
-        int rc = pIommu->pfnMemBulkAccess(pDevInsIommu, idDevice, cPages, (uint64_t const *)paGCPhysPages, PDMIOMMU_MEM_F_WRITE,
+        int rc = pIommu->pfnMemBulkAccess(pDevInsIommu, uDeviceId, cPages, (uint64_t const *)paGCPhysPages, PDMIOMMU_MEM_F_WRITE,
                                           paGCPhysOut);
         if (RT_SUCCESS(rc))
@@ -416 +416 @@
         }
         else
-            LogFunc(("IOMMU bulk translation failed. idDevice=%#x cPages=%zu rc=%Rrc\n", idDevice, cPages, rc));
+            LogFunc(("IOMMU bulk translation failed. uDeviceId=%#x cPages=%zu rc=%Rrc\n", uDeviceId, cPages, rc));
 
         RTMemFree(paGCPhysOut);

trunk/src/VBox/VMM/VMMAll/TMAll.cpp

@@ -1615 +1615 @@
  *                          for ring-3).
  * @param   pQueue          The shared queue data.
+ * @param   idxQueue        The queue index.
  */
 static int tmTimerSetRelative(PVMCC pVM, PTMTIMER pTimer, uint64_t cTicksToNext, uint64_t *pu64Now,

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

@@ -1524 +1524 @@
 
 /** @interface_method_impl{PDMIOAPICHLP,pfnIommuMsiRemap} */
-static DECLCALLBACK(int) pdmR0IoApicHlp_IommuMsiRemap(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
+static DECLCALLBACK(int) pdmR0IoApicHlp_IommuMsiRemap(PPDMDEVINS pDevIns, uint16_t uDeviceId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
@@ -1531 +1531 @@
 
 #ifdef VBOX_WITH_IOMMU_AMD
-    int rc = pdmIommuMsiRemap(pDevIns, idDevice, pMsiIn, pMsiOut);
+    int rc = pdmIommuMsiRemap(pDevIns, uDeviceId, pMsiIn, pMsiOut);
     if (RT_SUCCESS(rc) || rc != VERR_IOMMU_NOT_PRESENT)
         return rc;
 #else
-    RT_NOREF(pDevIns, idDevice);
+    RT_NOREF(pDevIns, uDeviceId);
 #endif
 

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

@@ -142 +142 @@
 
 /** @interface_method_impl{PDMIOAPICHLP,pfnIommuMsiRemap} */
-static DECLCALLBACK(int) pdmR3IoApicHlp_IommuMsiRemap(PPDMDEVINS pDevIns, uint16_t idDevice, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
+static DECLCALLBACK(int) pdmR3IoApicHlp_IommuMsiRemap(PPDMDEVINS pDevIns, uint16_t uDeviceId, PCMSIMSG pMsiIn, PMSIMSG pMsiOut)
 {
     PDMDEV_ASSERT_DEVINS(pDevIns);
@@ -149 +149 @@
 
 #ifdef VBOX_WITH_IOMMU_AMD
-    int rc = pdmIommuMsiRemap(pDevIns, idDevice, pMsiIn, pMsiOut);
+    int rc = pdmIommuMsiRemap(pDevIns, uDeviceId, pMsiIn, pMsiOut);
     if (RT_SUCCESS(rc) || rc != VERR_IOMMU_NOT_PRESENT)
         return rc;
 #else
-    RT_NOREF(pDevIns, idDevice);
+    RT_NOREF(pDevIns, uDeviceId);
 #endif
 

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

@@ -2290 +2290 @@
  * @param   pVM             The cross context VM structure.
  * @param   pQueue          The queue to run.
- * @param   pTimer          The head timer.  Caller already check that this is
+ * @param   pNext           The head timer.  Caller already check that this is
  *                          not NULL.
  */
@@ -2791 +2791 @@
  *
  * @param   pVM     The cross context VM structure.
- * @param   pVCpuDst    The destination VCpu.
+ * @param   pQueue  The queue.
  */
 static void tmR3TimerQueueDoVirtualSync(PVM pVM, PVMCPU pVCpuDst)