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

Timestamp:

Jan 25, 2007 8:49:05 PM (18 years ago)

Author:

vboxsync

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

17885

Message:

introduced PDMDevHlpGetVM()

File:

• trunk/src/VBox/Devices/Storage/DevATA.cpp (modified) (9 diffs)

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

@@ -2391 +2391 @@
                         PPDMDEVINS pDevIns = ATADEVSTATE_2_DEVINS(s);
                         PVMREQ pReq;
-                        rc = VMR3ReqCall(pDevIns->pDevHlp->pfnGetVM(pDevIns), &pReq, RT_INDEFINITE_WAIT,
+                        rc = VMR3ReqCall(PDMDevHlpGetVM(pDevIns), &pReq, RT_INDEFINITE_WAIT,
                                          (PFNRT)s->pDrvMount->pfnUnmount, 1, s->pDrvMount);
                         AssertReleaseRC(rc);
@@ -4580 +4580 @@
             MMGCRamWriteNoTrapHandler((char *)GCDst + i, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, cb);
 #else /* !IN_GC */
-        rc = PGMPhysWriteGCPtrDirty(pDevIns->pDevHlp->pfnGetVM(pDevIns), GCDst, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
+        rc = PGMPhysWriteGCPtrDirty(PDMDevHlpGetVM(pDevIns), GCDst, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);
         Assert(rc == VINF_SUCCESS);
 #endif /* IN_GC */
@@ -4637 +4637 @@
             MMGCRamReadNoTrapHandler(s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, (char *)GCSrc + i, cb);
 #else /* !IN_GC */
-        rc = PGMPhysReadGCPtr(pDevIns->pDevHlp->pfnGetVM(pDevIns), s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
+        rc = PGMPhysReadGCPtr(PDMDevHlpGetVM(pDevIns), s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);
         Assert(rc == VINF_SUCCESS);
 #endif /* IN_GC */
@@ -4728 +4728 @@
      * can be either from ataPowerOff or ataSuspend), there is no other
      * reasonable solution. */
-    fVMLocked = VMMR3LockIsOwner(pDevIns->pDevHlp->pfnGetVM(pDevIns));
+    fVMLocked = VMMR3LockIsOwner(PDMDevHlpGetVM(pDevIns));
 
     if (fVMLocked)
@@ -4764 +4764 @@
 {
     if (s->pbIOBufferHC)
-        s->pbIOBufferGC = MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), s->pbIOBufferHC);
+        s->pbIOBufferGC = MMHyperHC2GC(PDMDevHlpGetVM(pDevIns), s->pbIOBufferHC);
 }
 
@@ -4943 +4943 @@
      * Allocate I/O buffer.
      */
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
     if (pIf->cbIOBuffer)
     {
@@ -4952 +4953 @@
             AssertRelease(pIf->cbIOBuffer == ATA_MAX_MULT_SECTORS * 512);
         Assert(pIf->pbIOBufferHC);
-        Assert(pIf->pbIOBufferGC == MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), pIf->pbIOBufferHC));
+        Assert(pIf->pbIOBufferGC == MMHyperHC2GC(pVM, pIf->pbIOBufferHC));
     }
     else
@@ -4961 +4962 @@
             pIf->cbIOBuffer = ATA_MAX_MULT_SECTORS * 512;
         Assert(!pIf->pbIOBufferHC);
-        rc = MMHyperAlloc(pDevIns->pDevHlp->pfnGetVM(pDevIns), pIf->cbIOBuffer, 1, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferHC);
+        rc = MMHyperAlloc(pVM, pIf->cbIOBuffer, 1, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferHC);
         if (VBOX_FAILURE(rc))
             return VERR_NO_MEMORY;
-        pIf->pbIOBufferGC = MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), pIf->pbIOBufferHC);
+        pIf->pbIOBufferGC = MMHyperHC2GC(pVM, pIf->pbIOBufferHC);
     }
 
@@ -5404 +5405 @@
             pData->aCts[i].aIfs[j].pDevInsGC = PDMDEVINS_2_GCPTR(pDevIns);
             pData->aCts[i].aIfs[j].pControllerHC = &pData->aCts[i];
-            pData->aCts[i].aIfs[j].pControllerGC = MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), &pData->aCts[i]);
+            pData->aCts[i].aIfs[j].pControllerGC = MMHyperHC2GC(PDMDevHlpGetVM(pDevIns), &pData->aCts[i]);
             pData->aCts[i].aIfs[j].IBase.pfnQueryInterface = ataQueryInterface;
             pData->aCts[i].aIfs[j].IMountNotify.pfnMountNotify = ataMountNotify;