Changeset 66193 in vbox

Timestamp:

Mar 22, 2017 1:29:33 PM (8 years ago)

Author:

vboxsync

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

114106

Message:

pdmstorageifs.h: Return the region number on success too

Location:

trunk

Files:

• include/VBox/vmm/pdmstorageifs.h (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvHostBase.cpp (modified) (2 diffs)
• src/VBox/Devices/Storage/DrvVD.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmstorageifs.h

@@ -493 +493 @@
      * @param   pInterface      Pointer to the interface structure containing the called function pointer.
      * @param   u64LbaStart     Where to store the starting LBA for the region on success.
+     * @param   puRegion        Where to store the region number on success.
      * @param   pcBlocks        Where to store the number of blocks left in this region starting from the given LBA.
      * @param   pcbBlock        Where to store the size of one block in bytes on success.
@@ -498 +499 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnQueryRegionPropertiesForLba,(PPDMIMEDIA pInterface, uint64_t u64LbaStart,
-                                                              uint64_t *pcBlocks, uint64_t *pcbBlock,
-                                                              PVDREGIONDATAFORM penmDataForm));
+                                                              uint32_t *puRegion, uint64_t *pcBlocks,
+                                                              uint64_t *pcbBlock, PVDREGIONDATAFORM penmDataForm));
 
 } PDMIMEDIA;
 /** PDMIMEDIA interface ID. */
-#define PDMIMEDIA_IID                           "c2d1d87a-e1ae-4a70-ac85-f2ffe9c5b736"
+#define PDMIMEDIA_IID                           "8ec68c48-dd20-4430-8386-f0d628a5aca6"
 
 

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

@@ -396 +396 @@
 /** @interface_method_impl{PDMIMEDIA,pfnQueryRegionPropertiesForLba} */
 static DECLCALLBACK(int) drvHostBaseQueryRegionPropertiesForLba(PPDMIMEDIA pInterface, uint64_t u64LbaStart,
-                                                                uint64_t *pcBlocks, uint64_t *pcbBlock,
-                                                                PVDREGIONDATAFORM penmDataForm)
+                                                                uint32_t *puRegion, uint64_t *pcBlocks,
+                                                                uint64_t *pcbBlock, PVDREGIONDATAFORM penmDataForm)
 {
     LogFlowFunc(("\n"));
@@ -416 +416 @@
         rc = VERR_NOT_FOUND;
 
+        if (puRegion)
+            *puRegion = 0;
         if (pcBlocks)
             *pcBlocks = cbMedia / cbBlock;

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

@@ -2524 +2524 @@
 /** @interface_method_impl{PDMIMEDIA,pfnQueryRegionPropertiesForLba} */
 static DECLCALLBACK(int) drvvdQueryRegionPropertiesForLba(PPDMIMEDIA pInterface, uint64_t u64LbaStart,
-                                                          uint64_t *pcBlocks, uint64_t *pcbBlock,
-                                                          PVDREGIONDATAFORM penmDataForm)
+                                                          uint32_t *puRegion, uint64_t *pcBlocks,
+                                                          uint64_t *pcbBlock, PVDREGIONDATAFORM penmDataForm)
 {
     LogFlowFunc(("\n"));
@@ -2547 +2547 @@
                 uint64_t offRegion = u64LbaStart - pRegion->offRegion;
 
+                if (puRegion)
+                    *puRegion = i;
                 if (pcBlocks)
                     *pcBlocks = pRegion->cRegionBlocksOrBytes - offRegion;