Changeset 91920 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 21, 2021 6:45:26 AM (3 years ago)

Author:

vboxsync

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

147725

Message:

VMM,Devices: Eliminate direct calls to VMMR3 and VMR3 APIs and introduce callbacks in the device helper callback table, bugref:10074

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevAHCI.cpp (modified) (1 diff)
• DevATA.cpp (modified) (1 diff)
• DevBusLogic.cpp (modified) (1 diff)
• DevLsiLogicSCSI.cpp (modified) (1 diff)
• DevVirtioSCSI.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -3952 +3952 @@
     if (pThisCC->pMediaNotify)
     {
-        int rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                                   (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
-                                   pThisCC->pMediaNotify, pAhciPort->iLUN);
+        int rc = PDMDevHlpVMReqCallNoWait(pDevIns, VMCPUID_ANY,
+                                          (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
+                                          pThisCC->pMediaNotify, pAhciPort->iLUN);
         AssertRC(rc);
     }

trunk/src/VBox/Devices/Storage/DevATA.cpp

@@ -3789 +3789 @@
 
                     ataR3LockLeave(pDevIns, pCtl);
-                    rc = VMR3ReqPriorityCallWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                                                 (PFNRT)pDevR3->pDrvMount->pfnUnmount, 3,
-                                                 pDevR3->pDrvMount, false /*=fForce*/, true /*=fEject*/);
+                    rc = PDMDevHlpVMReqPriorityCallWait(pDevIns, VMCPUID_ANY,
+                                                        (PFNRT)pDevR3->pDrvMount->pfnUnmount, 3,
+                                                        pDevR3->pDrvMount, false /*=fForce*/, true /*=fEject*/);
                     Assert(RT_SUCCESS(rc) || rc == VERR_PDM_MEDIA_LOCKED || rc == VERR_PDM_MEDIA_NOT_MOUNTED);
                     if (RT_SUCCESS(rc) && pThisCC->pMediaNotify)
                     {
-                        rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                                               (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
-                                               pThisCC->pMediaNotify, s->iLUN);
+                        rc = PDMDevHlpVMReqCallNoWait(pDevIns, VMCPUID_ANY,
+                                                      (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
+                                                      pThisCC->pMediaNotify, s->iLUN);
                         AssertRC(rc);
                     }

trunk/src/VBox/Devices/Storage/DevBusLogic.cpp

@@ -3149 +3149 @@
     if (pThisCC->pMediaNotify)
     {
-        int rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                                   (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
-                                   pThisCC->pMediaNotify, pTgtDev->iLUN);
+        int rc = PDMDevHlpVMReqCallNoWait(pDevIns, VMCPUID_ANY,
+                                          (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
+                                          pThisCC->pMediaNotify, pTgtDev->iLUN);
         AssertRC(rc);
     }

trunk/src/VBox/Devices/Storage/DevLsiLogicSCSI.cpp

@@ -2512 +2512 @@
     if (pThisCC->pMediaNotify)
     {
-        int rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                                   (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
-                                   pThisCC->pMediaNotify, pTgtDev->iLUN);
+        int rc = PDMDevHlpVMReqCallNoWait(pDevIns, VMCPUID_ANY,
+                                          (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
+                                          pThisCC->pMediaNotify, pTgtDev->iLUN);
         AssertRC(rc);
     }

trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp

@@ -2321 +2321 @@
     if (pThisCC->pMediaNotify)
     {
-        int rc = VMR3ReqCallNoWait(PDMDevHlpGetVM(pDevIns), VMCPUID_ANY,
-                                   (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
-                                   pThisCC->pMediaNotify, pTarget->uTarget);
+        int rc = PDMDevHlpVMReqCallNoWait(pDevIns, VMCPUID_ANY,
+                                          (PFNRT)pThisCC->pMediaNotify->pfnEjected, 2,
+                                          pThisCC->pMediaNotify, pTarget->uTarget);
         AssertRC(rc);
     }