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

Timestamp:

Sep 26, 2016 4:32:53 PM (8 years ago)

Author:

vboxsync

Message:

Storage: Get rid of PDMIMEDIA::pfnIoBufAllocate and PDMIMEDIA::pfnIoBufFree, was only used by AHCI anyway and is superseded by the I/O buffer management in PDMIMEDIAEX now

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvDiskIntegrity.cpp (modified) (2 diffs)
• DrvHostBase.cpp (modified) (2 diffs)
• DrvRamDisk.cpp (modified) (2 diffs)
• DrvVD.cpp (modified) (2 diffs)

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

@@ -951 +951 @@
 }
 
-/** @interface_method_impl{PDMIMEDIA,pfnIoBufAlloc} */
-static DECLCALLBACK(int) drvdiskintIoBufAlloc(PPDMIMEDIA pInterface, size_t cb, void **ppvNew)
-{
-    LogFlowFunc(("\n"));
-    PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
-
-    return pThis->pDrvMedia->pfnIoBufAlloc(pThis->pDrvMedia, cb, ppvNew);
-}
-
-/** @interface_method_impl{PDMIMEDIA,pfnIoBufFree} */
-static DECLCALLBACK(int) drvdiskintIoBufFree(PPDMIMEDIA pInterface, void *pv, size_t cb)
-{
-    LogFlowFunc(("\n"));
-    PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
-
-    return pThis->pDrvMedia->pfnIoBufFree(pThis->pDrvMedia, pv, cb);
-}
-
 /** @interface_method_impl{PDMIMEDIA,pfnReadPcBios} */
 static DECLCALLBACK(int) drvdiskintReadPcBios(PPDMIMEDIA pInterface,
@@ -1661 +1643 @@
     pThis->IMedia.pfnGetSectorSize       = drvdiskintGetSectorSize;
     pThis->IMedia.pfnGetType             = drvdiskintGetType;
-    pThis->IMedia.pfnIoBufAlloc          = drvdiskintIoBufAlloc;
-    pThis->IMedia.pfnIoBufFree           = drvdiskintIoBufFree;
     pThis->IMedia.pfnReadPcBios          = drvdiskintReadPcBios;
 

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

@@ -324 +324 @@
 
     LogFlow(("%s-%d: drvHostBaseGetUuid: returns VINF_SUCCESS *pUuid=%RTuuid\n", pThis->pDrvIns->pReg->szName, pThis->pDrvIns->iInstance, pUuid));
-    return VINF_SUCCESS;
-}
-
-
-/** @interface_method_impl{PDMIBLOCK,pfnIoBufAlloc} */
-static DECLCALLBACK(int) drvHostBaseIoBufAlloc(PPDMIMEDIA pInterface, size_t cb, void **ppvNew)
-{
-    RT_NOREF(pInterface);
-    LogFlowFunc(("\n"));
-
-    int rc;
-    void *pvNew = RTMemAlloc(cb);
-    if (RT_LIKELY(pvNew))
-    {
-        *ppvNew = pvNew;
-        rc = VINF_SUCCESS;
-    }
-    else
-        rc = VERR_NO_MEMORY;
-
-    LogFlowFunc(("returns %Rrc\n", rc));
-    return rc;
-}
-
-/** @interface_method_impl{PDMIBLOCK,pfnIoBufFree} */
-static DECLCALLBACK(int) drvHostBaseIoBufFree(PPDMIMEDIA pInterface, void *pv, size_t cb)
-{
-    RT_NOREF(pInterface, cb);
-    LogFlowFunc(("\n"));
-
-    RTMemFree(pv);
-
-    LogFlowFunc(("returns %Rrc\n", VINF_SUCCESS));
     return VINF_SUCCESS;
 }
@@ -1910 +1877 @@
     pThis->IMedia.pfnGetType                = drvHostBaseGetType;
     pThis->IMedia.pfnGetUuid                = drvHostBaseGetUuid;
-    pThis->IMedia.pfnIoBufAlloc             = drvHostBaseIoBufAlloc;
-    pThis->IMedia.pfnIoBufFree              = drvHostBaseIoBufFree;
     pThis->IMedia.pfnBiosGetPCHSGeometry    = drvHostBaseGetPCHSGeometry;
     pThis->IMedia.pfnBiosSetPCHSGeometry    = drvHostBaseSetPCHSGeometry;

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

@@ -624 +624 @@
 }
 
-/** @copydoc PDMIMEDIA::pfnIoBufAlloc */
-static DECLCALLBACK(int) drvramdiskIoBufAlloc(PPDMIMEDIA pInterface, size_t cb, void **ppvNew)
-{
-    RT_NOREF1(pInterface);
-
-    int rc = VINF_SUCCESS;
-    void *pv = RTMemAlloc(cb);
-    if (pv)
-        *ppvNew = pv;
-    else
-        rc = VERR_NO_MEMORY;
-
-    return rc;
-}
-
-/** @copydoc PDMIMEDIA::pfnIoBufFree */
-static DECLCALLBACK(int) drvramdiskIoBufFree(PPDMIMEDIA pInterface, void *pv, size_t cb)
-{
-    RT_NOREF2(pInterface, cb);
-    RTMemFree(pv);
-    return VINF_SUCCESS;
-}
-
 /** @copydoc PDMIMEDIA::pfnReadPcBios */
 static DECLCALLBACK(int) drvramdiskReadPcBios(PPDMIMEDIA pInterface,
@@ -1661 +1638 @@
     pThis->IMedia.pfnGetUuid             = drvramdiskGetUuid;
     pThis->IMedia.pfnGetSectorSize       = drvramdiskGetSectorSize;
-    pThis->IMedia.pfnIoBufAlloc          = drvramdiskIoBufAlloc;
-    pThis->IMedia.pfnIoBufFree           = drvramdiskIoBufFree;
     pThis->IMedia.pfnReadPcBios          = drvramdiskReadPcBios;
     pThis->IMedia.pfnDiscard             = drvramdiskDiscard;

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

@@ -2375 +2375 @@
 }
 
-/** @interface_method_impl{PDMIMEDIA,pfnIoBufAlloc} */
-static DECLCALLBACK(int) drvvdIoBufAlloc(PPDMIMEDIA pInterface, size_t cb, void **ppvNew)
-{
-    LogFlowFunc(("\n"));
-    int rc;
-    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
-
-    /* Configured encryption requires locked down memory. */
-    if (pThis->pCfgCrypto)
-        rc = RTMemSaferAllocZEx(ppvNew, cb, RTMEMSAFER_F_REQUIRE_NOT_PAGABLE);
-    else
-    {
-        cb = RT_ALIGN_Z(cb, _4K);
-        void *pvNew = RTMemPageAlloc(cb);
-        if (RT_LIKELY(pvNew))
-        {
-            *ppvNew = pvNew;
-            rc = VINF_SUCCESS;
-        }
-        else
-            rc = VERR_NO_MEMORY;
-    }
-
-    LogFlowFunc(("returns %Rrc\n", rc));
-    return rc;
-}
-
-/** @interface_method_impl{PDMIMEDIA,pfnIoBufFree} */
-static DECLCALLBACK(int) drvvdIoBufFree(PPDMIMEDIA pInterface, void *pv, size_t cb)
-{
-    LogFlowFunc(("\n"));
-    int rc = VINF_SUCCESS;
-    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
-
-    if (pThis->pCfgCrypto)
-        RTMemSaferFree(pv, cb);
-    else
-    {
-        cb = RT_ALIGN_Z(cb, _4K);
-        RTMemPageFree(pv, cb);
-    }
-
-    LogFlowFunc(("returns %Rrc\n", rc));
-    return rc;
-}
-
-
 /* -=-=-=-=- IMount -=-=-=-=- */
 
@@ -4351 +4304 @@
     pThis->IMedia.pfnGetUuid             = drvvdGetUuid;
     pThis->IMedia.pfnDiscard             = drvvdDiscard;
-    pThis->IMedia.pfnIoBufAlloc          = drvvdIoBufAlloc;
-    pThis->IMedia.pfnIoBufFree           = drvvdIoBufFree;
     pThis->IMedia.pfnSendCmd             = NULL;