Changeset 17836 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Mar 13, 2009 3:26:27 PM (16 years ago)

Author:

vboxsync

Message:

API/HardDisk, Storage/VBoxHDD: use image variant, and to implement cloning to different image variant add a parameter to VDCopy.

Location:

trunk/src/VBox/Devices/Storage

Files:

• VBoxHDD.cpp (modified) (5 diffs)
• testcase/tstVD.cpp (modified) (1 diff)

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

@@ -1879 +1879 @@
  * @param   fMoveByRename   If true, attempt to perform a move by renaming (if successful the new size is ignored).
  * @param   cbSize          New image size (0 means leave unchanged).
+ * @param   uImageFlags     Flags specifying special destination image features.
  * @param   pDstUuid        New UUID of the destination image. If NULL, a new UUID is created.
  *                          This parameter is used if and only if a true copy is created.
@@ -1890 +1891 @@
 VBOXDDU_DECL(int) VDCopy(PVBOXHDD pDiskFrom, unsigned nImage, PVBOXHDD pDiskTo,
                          const char *pszBackend, const char *pszFilename,
-                         bool fMoveByRename, uint64_t cbSize, PCRTUUID pDstUuid,
+                         bool fMoveByRename, uint64_t cbSize,
+                         unsigned uImageFlags, PCRTUUID pDstUuid,
                          PVDINTERFACE pVDIfsOperation,
                          PVDINTERFACE pDstVDIfsImage,
@@ -1963 +1965 @@
         if (cbSize == 0)
             cbSize = cbSizeFrom;
-
-        unsigned uImageFlagsFrom;
-        uImageFlagsFrom = pImageFrom->Backend->pfnGetImageFlags(pImageFrom->pvBackendData);
 
         PDMMEDIAGEOMETRY PCHSGeometryFrom = {0, 0, 0};
@@ -2013 +2012 @@
         if (enmTypeFrom == VD_IMAGE_TYPE_DIFF)
         {
-            rc = VDCreateDiff(pDiskTo, pszBackend, pszFilename, uImageFlagsFrom,
+            rc = VDCreateDiff(pDiskTo, pszBackend, pszFilename, uImageFlags,
                               szComment, &ImageUuid, &ParentUuid, uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY, NULL, NULL);
         } else {
@@ -2022 +2021 @@
 
             rc = VDCreateBase(pDiskTo, pszBackend, pszFilename, enmTypeTo,
-                              cbSize, uImageFlagsFrom, szComment,
+                              cbSize, uImageFlags, szComment,
                               &PCHSGeometryFrom, &LCHSGeometryFrom,
                               NULL, uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY, NULL, NULL);

trunk/src/VBox/Devices/Storage/testcase/tstVD.cpp

@@ -735 +735 @@
     rc = VDOpen(pVD, "VMDK", src, VD_OPEN_FLAGS_NORMAL, NULL);
     CHECK("VDOpen()");
-    rc = VDCopy(pVD, 0, pVD, "VMDK", dst, true, 0, NULL, NULL, NULL, NULL);
+    rc = VDCopy(pVD, 0, pVD, "VMDK", dst, true, 0, VD_IMAGE_FLAGS_NONE, NULL, NULL, NULL, NULL);
     CHECK("VDCopy()");