Changeset 15591 in vbox for trunk/src/VBox

Timestamp:

Dec 16, 2008 2:46:08 PM (16 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD-new: introduce parent UUID parameter for VDCreateDiff. Makes creation of iSCSI snapshots easier.

Location:

trunk/src/VBox

Files:

• Devices/Storage/VBoxHDD-new.cpp (modified) (9 diffs)
• Devices/Storage/testcase/tstVD.cpp (modified) (1 diff)
• Main/HardDisk2Impl.cpp (modified) (2 diffs)

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

@@ -1420 +1420 @@
  * @param   pszComment      Pointer to image comment. NULL is ok.
  * @param   pUuid           New UUID of the image. If NULL, a new UUID is created.
+ * @param   pParentUuid     New parent UUID of the image. If NULL, the UUID is queried automatically.
  * @param   uOpenFlags      Image file open mode, see VD_OPEN_FLAGS_* constants.
  * @param   pVDIfsImage     Pointer to the per-image VD interface list.
@@ -1427 +1428 @@
                                const char *pszFilename, unsigned uImageFlags,
                                const char *pszComment, PCRTUUID pUuid,
-                               unsigned uOpenFlags, PVDINTERFACE pVDIfsImage,
+                               PCRTUUID pParentUuid, unsigned uOpenFlags,
+                               PVDINTERFACE pVDIfsImage,
                                PVDINTERFACE pVDIfsOperation)
 {
@@ -1434 +1436 @@
     RTUUID uuid;
 
-    LogFlowFunc(("pDisk=%#p pszBackend=\"%s\" pszFilename=\"%s\" uImageFlags=%#x pszComment=\"%s\" Uuid=%RTuuid uOpenFlags=%#x pVDIfsImage=%#p pVDIfsOperation=%#p\n",
-                 pDisk, pszBackend, pszFilename, uImageFlags, pszComment, pUuid, uOpenFlags,
+    LogFlowFunc(("pDisk=%#p pszBackend=\"%s\" pszFilename=\"%s\" uImageFlags=%#x pszComment=\"%s\" Uuid=%RTuuid ParentUuid=%RTuuid uOpenFlags=%#x pVDIfsImage=%#p pVDIfsOperation=%#p\n",
+                 pDisk, pszBackend, pszFilename, uImageFlags, pszComment, pUuid, pParentUuid, uOpenFlags,
                  pVDIfsImage, pVDIfsOperation));
 
@@ -1463 +1465 @@
         AssertMsgBreakStmt(pUuid == NULL || VALID_PTR(pUuid),
                            ("pUuid=%#p UUID=%RTuuid\n", pUuid, pUuid),
+                           rc = VERR_INVALID_PARAMETER);
+        /* The parent UUID may be NULL. */
+        AssertMsgBreakStmt(pParentUuid == NULL || VALID_PTR(pParentUuid),
+                           ("pParentUuid=%#p ParentUUID=%RTuuid\n", pParentUuid, pParentUuid),
                            rc = VERR_INVALID_PARAMETER);
         AssertMsgBreakStmt((uOpenFlags & ~VD_OPEN_FLAGS_MASK) == 0,
@@ -1544 +1550 @@
             int rc2;
 
-            rc2 = pDisk->pLast->Backend->pfnGetUuid(pDisk->pLast->pvBackendData,
-                                                    &Uuid);
-            if (RT_SUCCESS(rc2))
+            if (pParentUuid && !RTUuidIsNull(pParentUuid))
+            {
+                Uuid = *pParentUuid;
                 pImage->Backend->pfnSetParentUuid(pImage->pvBackendData, &Uuid);
+            }
+            else
+            {
+                rc2 = pDisk->pLast->Backend->pfnGetUuid(pDisk->pLast->pvBackendData,
+                                                        &Uuid);
+                if (RT_SUCCESS(rc2))
+                    pImage->Backend->pfnSetParentUuid(pImage->pvBackendData, &Uuid);
+            }
             rc2 = pDisk->pLast->Backend->pfnGetModificationUuid(pDisk->pLast->pvBackendData,
                                                                 &Uuid);
@@ -1554 +1568 @@
                                                               &Uuid);
             rc2 = pDisk->pLast->Backend->pfnGetTimeStamp(pDisk->pLast->pvBackendData,
-                                                             &ts);
+                                                         &ts);
             if (RT_SUCCESS(rc2))
                 pImage->Backend->pfnSetParentTimeStamp(pImage->pvBackendData, &ts);
@@ -2000 +2014 @@
         {
             rc = VDCreateDiff(pDiskTo, pszBackend, pszFilename, uImageFlagsFrom,
-                              szComment, &ImageUuid, uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY, NULL, NULL);
+                              szComment, &ImageUuid, &ParentUuid, uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY, NULL, NULL);
         } else {
             rc = VDCreateBase(pDiskTo, pszBackend, pszFilename, enmTypeFrom,
@@ -2008 +2022 @@
             if (RT_SUCCESS(rc) && !RTUuidIsNull(&ImageUuid))
                  pDiskTo->pLast->Backend->pfnSetUuid(pDiskTo->pLast->pvBackendData, &ImageUuid);
+            if (RT_SUCCESS(rc) && !RTUuidIsNull(&ParentUuid))
+                 pDiskTo->pLast->Backend->pfnSetParentUuid(pDiskTo->pLast->pvBackendData, &ParentUuid);
         }
         if (RT_FAILURE(rc))
@@ -2065 +2081 @@
         {
             pImageTo->Backend->pfnSetModificationUuid(pImageTo->pvBackendData, &ImageModificationUuid);
-            pImageTo->Backend->pfnGetParentUuid(pImageTo->pvBackendData, &ParentUuid);
             pImageTo->Backend->pfnGetParentModificationUuid(pImageTo->pvBackendData, &ParentModificationUuid);
         }

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

@@ -582 +582 @@
 
     rc = VDCreateDiff(pVD, pszBackend, pszDiffFilename,
-                      VD_IMAGE_FLAGS_NONE, "Test diff image", NULL,
+                      VD_IMAGE_FLAGS_NONE, "Test diff image", NULL, NULL,
                       VD_OPEN_FLAGS_NORMAL, NULL, NULL);
     CHECK("VDCreateDiff()");

trunk/src/VBox/Main/HardDisk2Impl.cpp

@@ -3371 +3371 @@
 
             /* 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();
@@ -3426 +3426 @@
                                         VD_IMAGE_FLAGS_NONE,
                                         NULL, targetId.raw(),
+                                        NULL /******/,
                                         VD_OPEN_FLAGS_NORMAL,
                                         target->mm.vdDiskIfaces,