Changeset 17836 in vbox

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

Files:

• include/VBox/VBoxHDD.h (modified) (2 diffs)
• src/VBox/Devices/Storage/VBoxHDD.cpp (modified) (5 diffs)
• src/VBox/Devices/Storage/testcase/tstVD.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (2 diffs)
• src/VBox/Main/HardDiskImpl.cpp (modified) (7 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/include/VBox/VBoxHDD.h

@@ -1262 +1262 @@
  * @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.
@@ -1273 +1274 @@
 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,

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()");
 

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

@@ -1323 +1323 @@
         else
         {
-            vrc = VDCopy(pDisk, 0, pDisk, "VMDK", Utf8Str(dst).raw(), true, 0, NULL, NULL, NULL, NULL);
+            vrc = VDCopy(pDisk, 0, pDisk, "VMDK", Utf8Str(dst).raw(), true, 0, VD_IMAGE_FLAGS_NONE, NULL, NULL, NULL, NULL);
             if (RT_FAILURE(vrc))
             {
@@ -1600 +1600 @@
         /* Create the output image */
         vrc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, Utf8Str(dstformat).raw(),
-                     Utf8Str(dst).raw(), false, 0, NULL, NULL, NULL, NULL);
+                     Utf8Str(dst).raw(), false, 0, VD_IMAGE_FLAGS_NONE, NULL, NULL, NULL, NULL);
         if (RT_FAILURE(vrc))
         {

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -2239 +2239 @@
  *
  * @param aTarget       Target hard disk.
+ * @param aVariant      Precise image variant to create.
  * @param aProgress     Where to find/store a Progress object to track operation
  *                      completion.
@@ -3400 +3401 @@
 
             /* The object may request a specific UUID (through a special form of
-             * the setLocation() argumet). Otherwise we have to generate it */
+             * the setLocation() argument). Otherwise we have to generate it */
             Guid id = that->m.id;
             bool generateUuid = id.isEmpty();
@@ -3440 +3441 @@
                                             VD_IMAGE_TYPE_FIXED,
                                         task->d.size * _1M,
-                                        VD_IMAGE_FLAGS_NONE,
+                                        task->d.variant,
                                         NULL, &geo, &geo, id.raw(),
                                         VD_OPEN_FLAGS_NORMAL,
@@ -3560 +3561 @@
 
                     vrc = VDCreateDiff (hdd, targetFormat, targetLocation,
-                                        VD_IMAGE_FLAGS_NONE,
+                                        task->d.variant,
                                         NULL, targetId.raw(),
                                         id.raw(),
@@ -3977 +3978 @@
 
             /* The object may request a specific UUID (through a special form of
-             * the setLocation() argumet). Otherwise we have to generate it */
+             * the setLocation() argument). Otherwise we have to generate it */
             Guid targetId = target->m.id;
             bool generateUuid = targetId.isEmpty();
@@ -4031 +4032 @@
 
                     vrc = VDCopy (hdd, 0, targetHdd, targetFormat,
-                                  targetLocation, false, 0, targetId.raw(),
-                                  NULL, target->mm.vdDiskIfaces,
+                                  targetLocation, false, 0, task->d.variant,
+                                  targetId.raw(), NULL,
+                                  target->mm.vdDiskIfaces,
                                   that->mm.vdDiskIfaces);
 
@@ -4253 +4255 @@
 
                     vrc = VDCreateDiff (hdd, format, location,
+                                        /// @todo use the same image variant as before
                                         VD_IMAGE_FLAGS_NONE,
                                         NULL, id.raw(),

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8413 +8413 @@
     <const name="VmdkStreamOptimized" value="0x04">
       <desc>
-        VMDK streamOptimized image. Epecial import/export format which is
+        VMDK streamOptimized image. Special import/export format which is
         read-only/append-only.
       </desc>