Changeset 33082 in vbox

Timestamp:

Oct 12, 2010 8:26:27 PM (14 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD: allow specifying the open mode explicitly, it makes no sense to copy the open mode (even with the readonly hacks we had)

Location:

trunk

Files:

• include/VBox/VBoxHDD.h (modified) (2 diffs)
• src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (7 diffs)
• src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (2 diffs)
• src/VBox/Main/MediumImpl.cpp (modified) (2 diffs)

trunk/include/VBox/VBoxHDD.h

@@ -2177 +2177 @@
  *                          This parameter is used if and only if a true copy is created.
  *                          In all rename/move cases or copy to existing image cases the modification UUIDs are copied over.
+ * @param   uOpenFlags      Image file open mode, see VD_OPEN_FLAGS_* constants.
+ *                          Only used if the destination image is created.
  * @param   pVDIfsOperation Pointer to the per-operation VD interface list.
  * @param   pDstVDIfsImage  Pointer to the per-image VD interface list, for the
@@ -2187 +2189 @@
                          bool fMoveByRename, uint64_t cbSize,
                          unsigned uImageFlags, PCRTUUID pDstUuid,
-                         PVDINTERFACE pVDIfsOperation,
+                         unsigned uOpenFlags, PVDINTERFACE pVDIfsOperation,
                          PVDINTERFACE pDstVDIfsImage,
                          PVDINTERFACE pDstVDIfsOperation);

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

@@ -5446 +5446 @@
  *                          This parameter is used if and only if a true copy is created.
  *                          In all rename/move cases the UUIDs are copied over.
+ * @param   uOpenFlags      Image file open mode, see VD_OPEN_FLAGS_* constants.
+ *                          Only used if the destination image is created.
  * @param   pVDIfsOperation Pointer to the per-operation VD interface list.
  * @param   pDstVDIfsImage  Pointer to the per-image VD interface list, for the
@@ -5456 +5458 @@
                          bool fMoveByRename, uint64_t cbSize,
                          unsigned uImageFlags, PCRTUUID pDstUuid,
-                         PVDINTERFACE pVDIfsOperation,
+                         unsigned uOpenFlags, PVDINTERFACE pVDIfsOperation,
                          PVDINTERFACE pDstVDIfsImage,
                          PVDINTERFACE pDstVDIfsOperation)
@@ -5466 +5468 @@
     PVDIMAGE pImageTo = NULL;
 
-    LogFlowFunc(("pDiskFrom=%#p nImage=%u pDiskTo=%#p pszBackend=\"%s\" pszFilename=\"%s\" fMoveByRename=%d cbSize=%llu pVDIfsOperation=%#p pDstVDIfsImage=%#p pDstVDIfsOperation=%#p\n",
-                 pDiskFrom, nImage, pDiskTo, pszBackend, pszFilename, fMoveByRename, cbSize, pVDIfsOperation, pDstVDIfsImage, pDstVDIfsOperation));
+    LogFlowFunc(("pDiskFrom=%#p nImage=%u pDiskTo=%#p pszBackend=\"%s\" pszFilename=\"%s\" fMoveByRename=%d cbSize=%llu uImageFlags=%#x pDstUuid=%#p uOpenFlags=%#x pVDIfsOperation=%#p pDstVDIfsImage=%#p pDstVDIfsOperation=%#p\n",
+                 pDiskFrom, nImage, pDiskTo, pszBackend, pszFilename, fMoveByRename, cbSize, uImageFlags, pDstUuid, uOpenFlags, pVDIfsOperation, pDstVDIfsImage, pDstVDIfsOperation));
 
     PVDINTERFACE pIfProgress = VDInterfaceGet(pVDIfsOperation,
@@ -5568 +5570 @@
             szComment[sizeof(szComment) - 1] = '\0';
 
-        unsigned uOpenFlagsFrom;
-        uOpenFlagsFrom = pImageFrom->Backend->pfnGetOpenFlags(pImageFrom->pBackendData);
-
         rc2 = vdThreadFinishRead(pDiskFrom);
         AssertRC(rc2);
@@ -5595 +5594 @@
                                   uImageFlags, szComment, &ImageUuid,
                                   NULL /* pParentUuid */,
-                                  uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY,
+                                  uOpenFlags & ~VD_OPEN_FLAGS_READONLY,
                                   pDstVDIfsImage, NULL);
 
@@ -5625 +5624 @@
                                   uImageFlags, szComment,
                                   &PCHSGeometryFrom, &LCHSGeometryFrom,
-                                  NULL, uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY, pDstVDIfsImage, NULL);
+                                  NULL, uOpenFlags & ~VD_OPEN_FLAGS_READONLY,
+                                  pDstVDIfsImage, NULL);
 
                 rc2 = vdThreadStartWrite(pDiskTo);
@@ -5759 +5759 @@
             if (!RTUuidIsNull(&ImageModificationUuid))
                 pImageTo->Backend->pfnSetModificationUuid(pImageTo->pBackendData, &ImageModificationUuid);
+
+            /* Set the requested open flags if they differ from the value
+             * required for creating the image and copying the contents. */
+            if (   pImageTo && pszFilename
+                && uOpenFlags != (uOpenFlags & ~VD_OPEN_FLAGS_READONLY))
+                rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pBackendData,
+                                                        uOpenFlags);
         }
     } while (0);

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -1556 +1556 @@
         else
         {
-            vrc = VDCopy(pDisk, 0, pDisk, "VMDK", dst.c_str(), true, 0, VD_IMAGE_FLAGS_NONE, NULL, NULL, NULL, NULL);
+            vrc = VDCopy(pDisk, 0, pDisk, "VMDK", dst.c_str(), true, 0,
+                         VD_IMAGE_FLAGS_NONE, NULL, VD_OPEN_FLAGS_NORMAL,
+                         NULL, NULL, NULL);
             if (RT_FAILURE(vrc))
             {
@@ -1838 +1840 @@
         vrc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, dstformat.c_str(),
                      dst.c_str(), false, 0, VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED,
-                     NULL, NULL, NULL, NULL);
+                     NULL, VD_OPEN_FLAGS_NORMAL, NULL, NULL, NULL);
         if (RT_FAILURE(vrc))
         {

trunk/src/VBox/Main/MediumImpl.cpp

@@ -6518 +6518 @@
                              task.mVariant,
                              targetId.raw(),
+                             VD_OPEN_FLAGS_NORMAL,
                              NULL /* pVDIfsOperation */,
                              pTarget->m->vdImageIfaces,
@@ -7107 +7108 @@
                              task.mVariant,
                              NULL /* pDstUuid */,
+                             VD_OPEN_FLAGS_NORMAL,
                              NULL /* pVDIfsOperation */,
                              task.mVDImageIfaces,