Changeset 100078 in vbox for trunk/src/VBox/Storage/VD.cpp

Timestamp:

Jun 6, 2023 5:15:22 AM (18 months ago)

Author:

vboxsync

Message:

Main/src-server and Storage: Immutable media handling flexibility added bugref:5995

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (14 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -2053 +2053 @@
  * to speed up the copy process if possible.
  */
-static int vdCopyHelper(PVDISK pDiskFrom, PVDIMAGE pImageFrom, PVDISK pDiskTo,
+static int vdCopyHelper(PVDISK pDiskFrom, PVDIMAGE pImageFrom, PVDISK pDiskTo, PVDIMAGE pImageTo,
                         uint64_t cbSize, unsigned cImagesFromRead, unsigned cImagesToRead,
                         bool fSuppressRedundantIo, PVDINTERFACEPROGRESS pIfProgress,
@@ -2068 +2068 @@
     unsigned uProgressOld = 0;
 
-    LogFlowFunc(("pDiskFrom=%#p pImageFrom=%#p pDiskTo=%#p cbSize=%llu cImagesFromRead=%u cImagesToRead=%u fSuppressRedundantIo=%RTbool pIfProgress=%#p pDstIfProgress=%#p\n",
-                 pDiskFrom, pImageFrom, pDiskTo, cbSize, cImagesFromRead, cImagesToRead, fSuppressRedundantIo, pDstIfProgress, pDstIfProgress));
+    LogFlowFunc(("pDiskFrom=%#p pImageFrom=%#p pDiskTo=%#p pImageTo=%#p cbSize=%llu cImagesFromRead=%u cImagesToRead=%u fSuppressRedundantIo=%RTbool pIfProgress=%#p pDstIfProgress=%#p\n",
+                 pDiskFrom, pImageFrom, pDiskTo, pImageTo, cbSize, cImagesFromRead, cImagesToRead, fSuppressRedundantIo, pDstIfProgress, pDstIfProgress));
 
     if (   (fSuppressRedundantIo || (cImagesFromRead > 0))
@@ -2147 +2147 @@
 
             /* Only do collapsed I/O if we are copying the data blockwise. */
-            rc = vdWriteHelperEx(pDiskTo, pDiskTo->pLast, NULL, uOffset, pvBuf,
+            rc = vdWriteHelperEx(pDiskTo, pImageTo, NULL, uOffset, pvBuf,
                                  cbThisRead, VDIOCTX_FLAGS_DONT_SET_MODIFIED_FLAG /* fFlags */,
                                  fBlockwiseCopy ? cImagesToRead : 0);
@@ -7183 +7183 @@
 
 
-VBOXDDU_DECL(int) VDCopyEx(PVDISK pDiskFrom, unsigned nImage, PVDISK pDiskTo,
+VBOXDDU_DECL(int) VDCopyEx(PVDISK pDiskFrom, unsigned nImageFrom, PVDISK pDiskTo, unsigned nImageTo,
                            const char *pszBackend, const char *pszFilename,
                            bool fMoveByRename, uint64_t cbSize,
@@ -7197 +7197 @@
     PVDIMAGE pImageTo = NULL;
 
-    LogFlowFunc(("pDiskFrom=%#p nImage=%u pDiskTo=%#p pszBackend=\"%s\" pszFilename=\"%s\" fMoveByRename=%d cbSize=%llu nImageFromSame=%u nImageToSame=%u uImageFlags=%#x pDstUuid=%#p uOpenFlags=%#x pVDIfsOperation=%#p pDstVDIfsImage=%#p pDstVDIfsOperation=%#p\n",
-                 pDiskFrom, nImage, pDiskTo, pszBackend, pszFilename, fMoveByRename, cbSize, nImageFromSame, nImageToSame, uImageFlags, pDstUuid, uOpenFlags, pVDIfsOperation, pDstVDIfsImage, pDstVDIfsOperation));
+    LogFlowFunc(("pDiskFrom=%#p nImageFrom=%u pDiskTo=%#p nImageTo=%u pszBackend=\"%s\" pszFilename=\"%s\" fMoveByRename=%d cbSize=%llu nImageFromSame=%u nImageToSame=%u uImageFlags=%#x pDstUuid=%#p uOpenFlags=%#x pVDIfsOperation=%#p pDstVDIfsImage=%#p pDstVDIfsOperation=%#p\n",
+                 pDiskFrom, nImageFrom, nImageTo, pDiskTo, pszBackend, pszFilename, fMoveByRename, cbSize, nImageFromSame, nImageToSame, uImageFlags, pDstUuid, uOpenFlags, pVDIfsOperation, pDstVDIfsImage, pDstVDIfsOperation));
 
     /* Check arguments. */
@@ -7212 +7212 @@
         AssertRC(rc2);
         fLockReadFrom = true;
-        PVDIMAGE pImageFrom = vdGetImageByNumber(pDiskFrom, nImage);
+        PVDIMAGE pImageFrom = vdGetImageByNumber(pDiskFrom, nImageFrom);
         AssertPtrBreakStmt(pImageFrom, rc = VERR_VD_IMAGE_NOT_FOUND);
         AssertPtrBreakStmt(pDiskTo, rc = VERR_INVALID_POINTER);
         AssertMsg(pDiskTo->u32Signature == VDISK_SIGNATURE,
                   ("u32Signature=%08x\n", pDiskTo->u32Signature));
-        AssertMsgBreakStmt(   (nImageFromSame < nImage || nImageFromSame == VD_IMAGE_CONTENT_UNKNOWN)
+        AssertMsgBreakStmt(   (nImageFromSame < nImageFrom || nImageFromSame == VD_IMAGE_CONTENT_UNKNOWN)
                            && (nImageToSame < pDiskTo->cImages || nImageToSame == VD_IMAGE_CONTENT_UNKNOWN)
                            && (   (nImageFromSame == VD_IMAGE_CONTENT_UNKNOWN && nImageToSame == VD_IMAGE_CONTENT_UNKNOWN)
@@ -7225 +7225 @@
 
         /* Move the image. */
-        if (pDiskFrom == pDiskTo)
+        if (fMoveByRename)
         {
             /* Rename only works when backends are the same, are file based
@@ -7345 +7345 @@
                 fLockWriteTo = true;
 
+                pImageTo = vdGetImageByNumber(pDiskTo, nImageTo);
+                AssertPtrBreakStmt(pImageTo, rc = VERR_VD_IMAGE_NOT_FOUND);
                 if (RT_SUCCESS(rc) && !RTUuidIsNull(&ImageUuid))
-                     pDiskTo->pLast->Backend->pfnSetUuid(pDiskTo->pLast->pBackendData, &ImageUuid);
+                     pImageTo->Backend->pfnSetUuid(pImageTo->pBackendData, &ImageUuid);
             }
             if (RT_FAILURE(rc))
                 break;
 
-            pImageTo = pDiskTo->pLast;
+            pImageTo = vdGetImageByNumber(pDiskTo, nImageTo);
             AssertPtrBreakStmt(pImageTo, rc = VERR_VD_IMAGE_NOT_FOUND);
 
@@ -7358 +7360 @@
         else
         {
-            pImageTo = pDiskTo->pLast;
+            pImageTo = vdGetImageByNumber(pDiskTo, nImageTo);
             AssertPtrBreakStmt(pImageTo, rc = VERR_VD_IMAGE_NOT_FOUND);
 
@@ -7387 +7389 @@
          * Don't optimize if the image existed or if it is a child image. */
         bool fSuppressRedundantIo = (   !(pszFilename == NULL || cImagesTo > 0)
-                                     || (nImageToSame != VD_IMAGE_CONTENT_UNKNOWN));
+                                     || (nImageToSame != VD_IMAGE_CONTENT_UNKNOWN)
+                                     || (pDiskTo == pDiskFrom));
         unsigned cImagesFromReadBack, cImagesToReadBack;
 
@@ -7394 +7397 @@
         else
         {
-            if (nImage == VD_LAST_IMAGE)
+            if (nImageFrom == VD_LAST_IMAGE)
                 cImagesFromReadBack = pDiskFrom->cImages - nImageFromSame - 1;
             else
-                cImagesFromReadBack = nImage - nImageFromSame;
+                cImagesFromReadBack = nImageFrom - nImageFromSame;
         }
 
@@ -7406 +7409 @@
 
         /* Copy the data. */
-        rc = vdCopyHelper(pDiskFrom, pImageFrom, pDiskTo, cbSize,
+        rc = vdCopyHelper(pDiskFrom, pImageFrom, pDiskTo, pImageTo, cbSize,
                           cImagesFromReadBack, cImagesToReadBack,
                           fSuppressRedundantIo, pIfProgress, pDstIfProgress);
@@ -7492 +7495 @@
                          PVDINTERFACE pDstVDIfsOperation)
 {
-    return VDCopyEx(pDiskFrom, nImage, pDiskTo, pszBackend, pszFilename, fMoveByRename,
+    return VDCopyEx(pDiskFrom, nImage, pDiskTo, VD_IMAGE_CONTENT_UNKNOWN, pszBackend, pszFilename, fMoveByRename,
                     cbSize, VD_IMAGE_CONTENT_UNKNOWN, VD_IMAGE_CONTENT_UNKNOWN,
                     uImageFlags, pDstUuid, uOpenFlags, pVDIfsOperation,
@@ -9674 +9677 @@
     return VINF_SUCCESS;
 }
-