Changeset 332 in vbox for trunk/src/VBox/Devices/Storage
- Timestamp:
- Jan 25, 2007 8:49:05 PM (18 years ago)
- svn:sync-xref-src-repo-rev:
- 17885
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Devices/Storage/DevATA.cpp
r307 r332 2391 2391 PPDMDEVINS pDevIns = ATADEVSTATE_2_DEVINS(s); 2392 2392 PVMREQ pReq; 2393 rc = VMR3ReqCall( pDevIns->pDevHlp->pfnGetVM(pDevIns), &pReq, RT_INDEFINITE_WAIT,2393 rc = VMR3ReqCall(PDMDevHlpGetVM(pDevIns), &pReq, RT_INDEFINITE_WAIT, 2394 2394 (PFNRT)s->pDrvMount->pfnUnmount, 1, s->pDrvMount); 2395 2395 AssertReleaseRC(rc); … … 4580 4580 MMGCRamWriteNoTrapHandler((char *)GCDst + i, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, cb); 4581 4581 #else /* !IN_GC */ 4582 rc = PGMPhysWriteGCPtrDirty( pDevIns->pDevHlp->pfnGetVM(pDevIns), GCDst, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer);4582 rc = PGMPhysWriteGCPtrDirty(PDMDevHlpGetVM(pDevIns), GCDst, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, cbTransfer); 4583 4583 Assert(rc == VINF_SUCCESS); 4584 4584 #endif /* IN_GC */ … … 4637 4637 MMGCRamReadNoTrapHandler(s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, (char *)GCSrc + i, cb); 4638 4638 #else /* !IN_GC */ 4639 rc = PGMPhysReadGCPtr( pDevIns->pDevHlp->pfnGetVM(pDevIns), s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer);4639 rc = PGMPhysReadGCPtr(PDMDevHlpGetVM(pDevIns), s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart, GCSrc, cbTransfer); 4640 4640 Assert(rc == VINF_SUCCESS); 4641 4641 #endif /* IN_GC */ … … 4728 4728 * can be either from ataPowerOff or ataSuspend), there is no other 4729 4729 * reasonable solution. */ 4730 fVMLocked = VMMR3LockIsOwner( pDevIns->pDevHlp->pfnGetVM(pDevIns));4730 fVMLocked = VMMR3LockIsOwner(PDMDevHlpGetVM(pDevIns)); 4731 4731 4732 4732 if (fVMLocked) … … 4764 4764 { 4765 4765 if (s->pbIOBufferHC) 4766 s->pbIOBufferGC = MMHyperHC2GC( pDevIns->pDevHlp->pfnGetVM(pDevIns), s->pbIOBufferHC);4766 s->pbIOBufferGC = MMHyperHC2GC(PDMDevHlpGetVM(pDevIns), s->pbIOBufferHC); 4767 4767 } 4768 4768 … … 4943 4943 * Allocate I/O buffer. 4944 4944 */ 4945 PVM pVM = PDMDevHlpGetVM(pDevIns); 4945 4946 if (pIf->cbIOBuffer) 4946 4947 { … … 4952 4953 AssertRelease(pIf->cbIOBuffer == ATA_MAX_MULT_SECTORS * 512); 4953 4954 Assert(pIf->pbIOBufferHC); 4954 Assert(pIf->pbIOBufferGC == MMHyperHC2GC(p DevIns->pDevHlp->pfnGetVM(pDevIns), pIf->pbIOBufferHC));4955 Assert(pIf->pbIOBufferGC == MMHyperHC2GC(pVM, pIf->pbIOBufferHC)); 4955 4956 } 4956 4957 else … … 4961 4962 pIf->cbIOBuffer = ATA_MAX_MULT_SECTORS * 512; 4962 4963 Assert(!pIf->pbIOBufferHC); 4963 rc = MMHyperAlloc(p DevIns->pDevHlp->pfnGetVM(pDevIns), pIf->cbIOBuffer, 1, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferHC);4964 rc = MMHyperAlloc(pVM, pIf->cbIOBuffer, 1, MM_TAG_PDM_DEVICE_USER, (void **)&pIf->pbIOBufferHC); 4964 4965 if (VBOX_FAILURE(rc)) 4965 4966 return VERR_NO_MEMORY; 4966 pIf->pbIOBufferGC = MMHyperHC2GC(p DevIns->pDevHlp->pfnGetVM(pDevIns), pIf->pbIOBufferHC);4967 pIf->pbIOBufferGC = MMHyperHC2GC(pVM, pIf->pbIOBufferHC); 4967 4968 } 4968 4969 … … 5404 5405 pData->aCts[i].aIfs[j].pDevInsGC = PDMDEVINS_2_GCPTR(pDevIns); 5405 5406 pData->aCts[i].aIfs[j].pControllerHC = &pData->aCts[i]; 5406 pData->aCts[i].aIfs[j].pControllerGC = MMHyperHC2GC( pDevIns->pDevHlp->pfnGetVM(pDevIns), &pData->aCts[i]);5407 pData->aCts[i].aIfs[j].pControllerGC = MMHyperHC2GC(PDMDevHlpGetVM(pDevIns), &pData->aCts[i]); 5407 5408 pData->aCts[i].aIfs[j].IBase.pfnQueryInterface = ataQueryInterface; 5408 5409 pData->aCts[i].aIfs[j].IMountNotify.pfnMountNotify = ataMountNotify;
Note:
See TracChangeset
for help on using the changeset viewer.