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

Timestamp:

Mar 20, 2017 11:09:16 AM (8 years ago)

Author:

vboxsync

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

114075

Message:

pdmstorageifs.h,DrvVD.cpp: Add region descriptor API for media which can have multiple regions with different properties (tracks with different sector sizes)

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (7 diffs)

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

@@ -364 +364 @@
     /** BIOS LCHS Geometry. */
     PDMMEDIAGEOMETRY        LCHSGeometry;
+    /** Region list. */
+    PVDREGIONLIST           pRegionList;
 
     /** Cryptographic support
@@ -535 +537 @@
 }
 
+/**
+ * Converts from VD region data form enum to the PDM variant.
+ *
+ * @returns PDM media region data form.
+ * @param   enmDataForm         The VD region data form.
+ */
+static PDMMEDIAREGIONDATAFORM drvvdVDRegionForm2PdmDataForm(VDREGIONDATAFORM enmDataForm)
+{
+    switch (enmDataForm)
+    {
+        #define VDDATAFORM2PDM(tag) case VDREGIONDATAFORM_##tag: return PDMMEDIAREGIONDATAFORM_##tag
+
+        VDDATAFORM2PDM(INVALID);
+        VDDATAFORM2PDM(RAW);
+        VDDATAFORM2PDM(CDDA);
+        VDDATAFORM2PDM(CDDA_PAUSE);
+        VDDATAFORM2PDM(MODE1_2048);
+        VDDATAFORM2PDM(MODE1_2352);
+        VDDATAFORM2PDM(MODE1_0);
+        VDDATAFORM2PDM(XA_2336);
+        VDDATAFORM2PDM(XA_2352);
+        VDDATAFORM2PDM(XA_0);
+        VDDATAFORM2PDM(MODE2_2336);
+        VDDATAFORM2PDM(MODE2_2352);
+        VDDATAFORM2PDM(MODE2_0);
+
+        #undef VDDATAFORM2PDM
+
+        default:
+        {
+            AssertMsgFailed(("Unknown data form %d! forgot to add it to the switch?\n", enmDataForm));
+            return PDMMEDIAREGIONDATAFORM_INVALID;
+        }
+    }
+}
 
 /*********************************************************************************************************************************
@@ -2451 +2488 @@
 }
 
+/** @interface_method_impl{PDMIMEDIA,pfnDiscard} */
 static DECLCALLBACK(int) drvvdDiscard(PPDMIMEDIA pInterface, PCRTRANGE paRanges, unsigned cRanges)
 {
@@ -2464 +2502 @@
     else
         STAM_REL_COUNTER_INC(&pThis->StatReqsFailed);
+
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
+}
+
+/** @interface_method_impl{PDMIMEDIA,pfnGetRegionCount} */
+static DECLCALLBACK(uint32_t) drvvdGetRegionCount(PPDMIMEDIA pInterface)
+{
+    LogFlowFunc(("\n"));
+    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
+    uint32_t cRegions = 0;
+
+    if (!pThis->pRegionList)
+    {
+        int rc = VDQueryRegions(pThis->pDisk, VD_LAST_IMAGE, VD_REGION_LIST_F_LOC_SIZE_BLOCKS,
+                                &pThis->pRegionList);
+        if (RT_SUCCESS(rc))
+            cRegions = pThis->pRegionList->cRegions;
+    }
+    else
+        cRegions = pThis->pRegionList->cRegions;
+
+    LogFlowFunc(("returns %u\n", cRegions));
+    return cRegions;
+}
+
+/** @interface_method_impl{PDMIMEDIA,pfnQueryRegionProperties} */
+static DECLCALLBACK(int) drvvdQueryRegionProperties(PPDMIMEDIA pInterface, uint32_t uRegion, uint64_t *pu64LbaStart,
+                                                    uint64_t *pcBlocks, uint64_t *pcbBlock,
+                                                    PPDMMEDIAREGIONDATAFORM penmDataForm)
+{
+    LogFlowFunc(("\n"));
+    int rc = VINF_SUCCESS;
+    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
+
+    if (   pThis->pRegionList
+        && uRegion < pThis->pRegionList->cRegions)
+    {
+        PCVDREGIONDESC pRegion = &pThis->pRegionList->aRegions[uRegion];
+
+        if (pu64LbaStart)
+            *pu64LbaStart = pRegion->offRegion;
+        if (pcBlocks)
+            *pcBlocks = pRegion->cRegionBlocksOrBytes;
+        if (pcbBlock)
+            *pcbBlock = pRegion->cbBlock;
+        if (penmDataForm)
+            *penmDataForm = drvvdVDRegionForm2PdmDataForm(pRegion->enmDataForm);
+    }
+    else
+        rc = VERR_NOT_FOUND;
+
+    LogFlowFunc(("returns %Rrc\n", rc));
+    return rc;
+}
+
+/** @interface_method_impl{PDMIMEDIA,pfnQueryRegionPropertiesForLba} */
+static DECLCALLBACK(int) drvvdQueryRegionPropertiesForLba(PPDMIMEDIA pInterface, uint64_t u64LbaStart,
+                                                          uint64_t *pcBlocks, uint64_t *pcbBlock,
+                                                          PPDMMEDIAREGIONDATAFORM penmDataForm)
+{
+    LogFlowFunc(("\n"));
+    int rc = VINF_SUCCESS;
+    PVBOXDISK pThis = PDMIMEDIA_2_VBOXDISK(pInterface);
+
+    if (!pThis->pRegionList)
+        rc = VDQueryRegions(pThis->pDisk, VD_LAST_IMAGE, VD_REGION_LIST_F_LOC_SIZE_BLOCKS,
+                            &pThis->pRegionList);
+
+    if (RT_SUCCESS(rc))
+    {
+        rc = VERR_NOT_FOUND;
+
+        for (uint32_t i = 0; i < pThis->pRegionList->cRegions; i++)
+        {
+            PCVDREGIONDESC pRegion = &pThis->pRegionList->aRegions[i];
+            if (   pRegion->offRegion <= u64LbaStart
+                && pRegion->offRegion + pRegion->cRegionBlocksOrBytes > u64LbaStart)
+            {
+                uint64_t offRegion = u64LbaStart - pRegion->offRegion;
+
+                if (pcBlocks)
+                    *pcBlocks = pRegion->cRegionBlocksOrBytes - offRegion;
+                if (pcbBlock)
+                    *pcbBlock = pRegion->cbBlock;
+                if (penmDataForm)
+                    *penmDataForm = drvvdVDRegionForm2PdmDataForm(pRegion->enmDataForm);
+
+                rc = VINF_SUCCESS;
+            }
+        }
+    }
+    else
+        rc = VERR_NOT_FOUND;
 
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -4496 +4628 @@
         PDMR3BlkCacheRelease(pThis->pBlkCache);
         pThis->pBlkCache = NULL;
+    }
+
+    if (RT_VALID_PTR(pThis->pRegionList))
+    {
+        VDRegionListFree(pThis->pRegionList);
+        pThis->pRegionList = NULL;
     }
 
@@ -4752 +4890 @@
     pThis->hIoReqCache                  = NIL_RTMEMCACHE;
     pThis->hIoBufMgr                    = NIL_IOBUFMGR;
+    pThis->pRegionList                  = NULL;
 
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->aIoReqAllocBins); i++)
@@ -4757 +4896 @@
 
     /* IMedia */
-    pThis->IMedia.pfnRead               = drvvdRead;
-    pThis->IMedia.pfnReadPcBios         = drvvdReadPcBios;
-    pThis->IMedia.pfnWrite              = drvvdWrite;
-    pThis->IMedia.pfnFlush              = drvvdFlush;
-    pThis->IMedia.pfnMerge              = drvvdMerge;
-    pThis->IMedia.pfnSetSecKeyIf        = drvvdSetSecKeyIf;
-    pThis->IMedia.pfnGetSize            = drvvdGetSize;
-    pThis->IMedia.pfnGetSectorSize      = drvvdGetSectorSize;
-    pThis->IMedia.pfnIsReadOnly         = drvvdIsReadOnly;
-    pThis->IMedia.pfnIsNonRotational     = drvvdIsNonRotational;
-    pThis->IMedia.pfnBiosGetPCHSGeometry = drvvdBiosGetPCHSGeometry;
-    pThis->IMedia.pfnBiosSetPCHSGeometry = drvvdBiosSetPCHSGeometry;
-    pThis->IMedia.pfnBiosGetLCHSGeometry = drvvdBiosGetLCHSGeometry;
-    pThis->IMedia.pfnBiosSetLCHSGeometry = drvvdBiosSetLCHSGeometry;
-    pThis->IMedia.pfnBiosIsVisible       = drvvdBiosIsVisible;
-    pThis->IMedia.pfnGetType             = drvvdGetType;
-    pThis->IMedia.pfnGetUuid             = drvvdGetUuid;
-    pThis->IMedia.pfnDiscard             = drvvdDiscard;
-    pThis->IMedia.pfnSendCmd             = NULL;
+    pThis->IMedia.pfnRead                        = drvvdRead;
+    pThis->IMedia.pfnReadPcBios                  = drvvdReadPcBios;
+    pThis->IMedia.pfnWrite                       = drvvdWrite;
+    pThis->IMedia.pfnFlush                       = drvvdFlush;
+    pThis->IMedia.pfnMerge                       = drvvdMerge;
+    pThis->IMedia.pfnSetSecKeyIf                 = drvvdSetSecKeyIf;
+    pThis->IMedia.pfnGetSize                     = drvvdGetSize;
+    pThis->IMedia.pfnGetSectorSize               = drvvdGetSectorSize;
+    pThis->IMedia.pfnIsReadOnly                  = drvvdIsReadOnly;
+    pThis->IMedia.pfnIsNonRotational             = drvvdIsNonRotational;
+    pThis->IMedia.pfnBiosGetPCHSGeometry         = drvvdBiosGetPCHSGeometry;
+    pThis->IMedia.pfnBiosSetPCHSGeometry         = drvvdBiosSetPCHSGeometry;
+    pThis->IMedia.pfnBiosGetLCHSGeometry         = drvvdBiosGetLCHSGeometry;
+    pThis->IMedia.pfnBiosSetLCHSGeometry         = drvvdBiosSetLCHSGeometry;
+    pThis->IMedia.pfnBiosIsVisible               = drvvdBiosIsVisible;
+    pThis->IMedia.pfnGetType                     = drvvdGetType;
+    pThis->IMedia.pfnGetUuid                     = drvvdGetUuid;
+    pThis->IMedia.pfnDiscard                     = drvvdDiscard;
+    pThis->IMedia.pfnSendCmd                     = NULL;
+    pThis->IMedia.pfnGetRegionCount              = drvvdGetRegionCount;
+    pThis->IMedia.pfnQueryRegionProperties       = drvvdQueryRegionProperties;
+    pThis->IMedia.pfnQueryRegionPropertiesForLba = drvvdQueryRegionPropertiesForLba;
 
     /* IMount */