VirtualBox

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


Ignore:
Timestamp:
Jan 25, 2007 8:49:05 PM (18 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
17885
Message:

introduced PDMDevHlpGetVM()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Storage/DevATA.cpp

    r307 r332  
    23912391                        PPDMDEVINS pDevIns = ATADEVSTATE_2_DEVINS(s);
    23922392                        PVMREQ pReq;
    2393                         rc = VMR3ReqCall(pDevIns->pDevHlp->pfnGetVM(pDevIns), &pReq, RT_INDEFINITE_WAIT,
     2393                        rc = VMR3ReqCall(PDMDevHlpGetVM(pDevIns), &pReq, RT_INDEFINITE_WAIT,
    23942394                                         (PFNRT)s->pDrvMount->pfnUnmount, 1, s->pDrvMount);
    23952395                        AssertReleaseRC(rc);
     
    45804580            MMGCRamWriteNoTrapHandler((char *)GCDst + i, s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, cb);
    45814581#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);
    45834583        Assert(rc == VINF_SUCCESS);
    45844584#endif /* IN_GC */
     
    46374637            MMGCRamReadNoTrapHandler(s->CTXSUFF(pbIOBuffer) + s->iIOBufferPIODataStart + i, (char *)GCSrc + i, cb);
    46384638#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);
    46404640        Assert(rc == VINF_SUCCESS);
    46414641#endif /* IN_GC */
     
    47284728     * can be either from ataPowerOff or ataSuspend), there is no other
    47294729     * reasonable solution. */
    4730     fVMLocked = VMMR3LockIsOwner(pDevIns->pDevHlp->pfnGetVM(pDevIns));
     4730    fVMLocked = VMMR3LockIsOwner(PDMDevHlpGetVM(pDevIns));
    47314731
    47324732    if (fVMLocked)
     
    47644764{
    47654765    if (s->pbIOBufferHC)
    4766         s->pbIOBufferGC = MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), s->pbIOBufferHC);
     4766        s->pbIOBufferGC = MMHyperHC2GC(PDMDevHlpGetVM(pDevIns), s->pbIOBufferHC);
    47674767}
    47684768
     
    49434943     * Allocate I/O buffer.
    49444944     */
     4945    PVM pVM = PDMDevHlpGetVM(pDevIns);
    49454946    if (pIf->cbIOBuffer)
    49464947    {
     
    49524953            AssertRelease(pIf->cbIOBuffer == ATA_MAX_MULT_SECTORS * 512);
    49534954        Assert(pIf->pbIOBufferHC);
    4954         Assert(pIf->pbIOBufferGC == MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), pIf->pbIOBufferHC));
     4955        Assert(pIf->pbIOBufferGC == MMHyperHC2GC(pVM, pIf->pbIOBufferHC));
    49554956    }
    49564957    else
     
    49614962            pIf->cbIOBuffer = ATA_MAX_MULT_SECTORS * 512;
    49624963        Assert(!pIf->pbIOBufferHC);
    4963         rc = MMHyperAlloc(pDevIns->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);
    49644965        if (VBOX_FAILURE(rc))
    49654966            return VERR_NO_MEMORY;
    4966         pIf->pbIOBufferGC = MMHyperHC2GC(pDevIns->pDevHlp->pfnGetVM(pDevIns), pIf->pbIOBufferHC);
     4967        pIf->pbIOBufferGC = MMHyperHC2GC(pVM, pIf->pbIOBufferHC);
    49674968    }
    49684969
     
    54045405            pData->aCts[i].aIfs[j].pDevInsGC = PDMDEVINS_2_GCPTR(pDevIns);
    54055406            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]);
    54075408            pData->aCts[i].aIfs[j].IBase.pfnQueryInterface = ataQueryInterface;
    54085409            pData->aCts[i].aIfs[j].IMountNotify.pfnMountNotify = ataMountNotify;
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette