Changeset 91944 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 21, 2021 1:02:36 PM (3 years ago)

Author:

vboxsync

Message:

VMM,Devices: Eliminate direct calls to DBGFR3* and use the device helper callbacks, bugref:10074

Location:

trunk/src/VBox/Devices

Files:

• Audio/DevIchAc97.cpp (modified) (1 diff)
• Network/DevVirtioNet.cpp (modified) (2 diffs)
• VMMDev/VMMDev.cpp (modified) (2 diffs)
• VMMDev/VMMDevTesting.cpp (modified) (2 diffs)
• VirtIO/Virtio.cpp (modified) (5 diffs)
• VirtIO/Virtio.h (modified) (1 diff)

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

@@ -2833 +2833 @@
 # ifdef LOG_ENABLED
                             if (LogIsFlowEnabled())
-                                ichac97R3DbgPrintBdl(pDevIns, pThis, pStream, DBGFR3InfoLogHlp(), "ichac97IoPortNabmWrite: ");
+                                ichac97R3DbgPrintBdl(pDevIns, pThis, pStream, PDMDevHlpDBGFInfoLogHlp(pDevIns), "ichac97IoPortNabmWrite: ");
 # endif
                             ichac97R3StreamEnable(pDevIns, pThis, pThisCC, pStream, pStreamCC, true /* fEnable */);

trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

@@ -1925 +1925 @@
 
     /* Save the common part */
-    int rc = vpciR3SaveExec(pHlp, &pThis->VPCI, pSSM);
+    int rc = vpciR3SaveExec(pDevIns, pHlp, &pThis->VPCI, pSSM);
     AssertRCReturn(rc, rc);
 
@@ -1975 +1975 @@
         LogRel(("%s: The mac address differs: config=%RTmac saved=%RTmac\n", INSTANCE(pThis), &pThis->macConfigured, &macConfigured));
 
-    rc = vpciR3LoadExec(pHlp, &pThis->VPCI, pSSM, uVersion, uPass, VNET_N_QUEUES);
+    rc = vpciR3LoadExec(pDevIns, pHlp, &pThis->VPCI, pSSM, uVersion, uPass, VNET_N_QUEUES);
     AssertRCReturn(rc, rc);
 

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

@@ -597 +597 @@
     {
         VMMDevReqNtBugCheck const *pReq = (VMMDevReqNtBugCheck const *)pReqHdr;
-        DBGFR3ReportBugCheck(PDMDevHlpGetVM(pDevIns), PDMDevHlpGetVMCPU(pDevIns), DBGFEVENT_BSOD_VMMDEV,
-                             pReq->uBugCheck, pReq->auParameters[0], pReq->auParameters[1],
-                             pReq->auParameters[2], pReq->auParameters[3]);
+        PDMDevHlpDBGFReportBugCheck(pDevIns, DBGFEVENT_BSOD_VMMDEV,
+                                    pReq->uBugCheck, pReq->auParameters[0], pReq->auParameters[1],
+                                    pReq->auParameters[2], pReq->auParameters[3]);
     }
     else if (pReqHdr->size == sizeof(VMMDevRequestHeader))
     {
         LogRel(("VMMDev: NT BugCheck w/o data.\n"));
-        DBGFR3ReportBugCheck(PDMDevHlpGetVM(pDevIns), PDMDevHlpGetVMCPU(pDevIns), DBGFEVENT_BSOD_VMMDEV,
-                             0, 0, 0, 0, 0);
+        PDMDevHlpDBGFReportBugCheck(pDevIns, DBGFEVENT_BSOD_VMMDEV, 0, 0, 0, 0, 0);
     }
     else
@@ -2631 +2630 @@
      * Write the core file.
      */
-    PUVM pUVM = PDMDevHlpGetUVM(pDevIns);
-    return DBGFR3CoreWrite(pUVM, szCorePath, true /*fReplaceFile*/);
+    return PDMDevHlpDBGFCoreWrite(pDevIns, szCorePath, true /*fReplaceFile*/);
 }
 

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

@@ -260 +260 @@
     if (cchValueNm && pszRegNm && *pszRegNm)
     {
-        PUVM        pUVM  = PDMDevHlpGetUVM(pDevIns);
-        PVM         pVM   = PDMDevHlpGetVM(pDevIns);
-        VMCPUID     idCpu = VMMGetCpuId(pVM);
+        VMCPUID     idCpu = PDMDevHlpGetCurrentCpuId(pDevIns);
         uint64_t    u64Value;
-        int rc2 = DBGFR3RegNmQueryU64(pUVM, idCpu, pszRegNm, &u64Value);
+        int rc2 = PDMDevHlpDBGFRegNmQueryU64(pDevIns, idCpu, pszRegNm, &u64Value);
         if (RT_SUCCESS(rc2))
         {
@@ -271 +269 @@
             char szFormat[128], szValue[128];
             RTStrPrintf(szFormat, sizeof(szFormat), "%%VR{%s}", pszRegNm);
-            rc2 = DBGFR3RegPrintf(pUVM, idCpu, szValue, sizeof(szValue), szFormat);
+            rc2 = PDMDevHlpDBGFRegPrintf(pDevIns, idCpu, szValue, sizeof(szValue), szFormat);
             if (RT_SUCCESS(rc2))
                 VMMDEV_TESTING_OUTPUT(("testing: VALUE '%s'%*s: %16s {reg=%s}%s\n",

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -693 +693 @@
 
 # ifdef LOG_ENABLED
-void vpciR3DumpState(PVPCISTATE pThis, const char *pcszCaller)
+void vpciR3DumpState(PPDMDEVINS pDevIns, PVPCISTATE pThis, const char *pcszCaller)
 {
     if (LogIs2Enabled())
     {
         Log2(("vpciR3DumpState: (called from %s)\n", pcszCaller));
-        vpciR3DumpStateWorker(pThis, DBGFR3InfoLogHlp());
+        vpciR3DumpStateWorker(pThis, PDMDevHlpDBGFInfoLogHlp(pDevIns));
     }
 }
@@ -709 +709 @@
  *
  * @returns VBox status code.
+ * @param   pDevIns     The device insatnce data.
  * @param   pHlp        The device helpers.
  * @param   pThis       The shared virtio core instance data.
  * @param   pSSM        The handle to the saved state.
  */
-int vpciR3SaveExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM)
-{
-    vpciR3DumpState(pThis, "vpciR3SaveExec");
+int vpciR3SaveExec(PPDMDEVINS pDevIns, PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM)
+{
+    vpciR3DumpState(pDevIns, pThis, "vpciR3SaveExec");
 
     pHlp->pfnSSMPutU32(pSSM, pThis->uGuestFeatures);
@@ -741 +742 @@
  *
  * @returns VBox status code.
+ * @param   pDevIns     The device insatnce data.
  * @param   pHlp        The device helpers.
  * @param   pThis       The shared virtio core instance data.
@@ -748 +750 @@
  * @param   cQueues     The default queue count (for old states).
  */
-int vpciR3LoadExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues)
+int vpciR3LoadExec(PPDMDEVINS pDevIns, PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues)
 {
     int rc;
@@ -790 +792 @@
     }
 
-    vpciR3DumpState(pThis, "vpciLoadExec");
+    vpciR3DumpState(pDevIns, pThis, "vpciLoadExec");
 
     return VINF_SUCCESS;

trunk/src/VBox/Devices/VirtIO/Virtio.h

@@ -283 +283 @@
 void  vpciR3SetWriteLed(PVPCISTATE pThis, bool fOn);
 void  vpciR3SetReadLed(PVPCISTATE pThis, bool fOn);
-int   vpciR3SaveExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM);
-int   vpciR3LoadExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues);
+int   vpciR3SaveExec(PPDMDEVINS pDevIns, PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM);
+int   vpciR3LoadExec(PPDMDEVINS pDevIns, PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues);
 void  vpciR3DumpStateWorker(PVPCISTATE pThis, PCDBGFINFOHLP pHlp);