Changeset 13268 in vbox for trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

Timestamp:

Oct 14, 2008 3:15:54 PM (16 years ago)

Author:

vboxsync

Message:

#3230: First bunch of integrated VMDK backend fixes by xVM Server team. Fixes vmdk renaming issues, test cases included.

File:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (12 diffs)

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

@@ -2288 +2288 @@
     if (pExtent->pFile != NULL)
     {
+        /* Do not delete raw extents, these have full and base names equal. */
         vmdkFileClose(pImage, &pExtent->pFile,
                          fDelete
@@ -2428 +2429 @@
         pExtent->pFile = pFile;
         pImage->pFile = NULL;
-        pExtent->pszFullname = RTStrDup(pImage->pszFilename);
+        pExtent->pszFullname = RTPathAbsDup(pImage->pszFilename);
         if (!pExtent->pszFullname)
         {
@@ -3393 +3394 @@
         pImage->pExtents = NULL;
     }
+    pImage->cExtents = 0;
     if (pImage->pFile != NULL)
         vmdkFileClose(pImage, &pImage->pFile, fDelete);
@@ -3956 +3958 @@
     bool   fEmbeddedDesc = false;
     unsigned    cExtents = pImage->cExtents;
-    char *pszNewBasename;
-    char *pszOldBasename;
+    char *pszNewBaseName = NULL;
+    char *pszOldBaseName = NULL;
+    char *pszNewFullName = NULL;
+    char *pszOldFullName = NULL;
+    const char *pszOldImageName;
     unsigned i, line;
     VMDKDESCRIPTOR DescriptorCopy;
@@ -4013 +4018 @@
 
     /* Prepare both old and new base names used for string replacement. */
-    pszNewBasename = RTStrDup(RTPathFilename(pszFilename));
-    RTPathStripExt(pszNewBasename);
-    pszOldBasename = RTStrDup(RTPathFilename(pImage->pszFilename));
-    RTPathStripExt(pszOldBasename);
+    pszNewBaseName = RTStrDup(RTPathFilename(pszFilename));
+    RTPathStripExt(pszNewBaseName);
+    pszOldBaseName = RTStrDup(RTPathFilename(pImage->pszFilename));
+    RTPathStripExt(pszOldBaseName);
+    /* Prepare both old and new full names used for string replacement. */
+    pszNewFullName = RTStrDup(pszFilename);
+    RTPathStripExt(pszNewFullName);
+    pszOldFullName = RTStrDup(pImage->pszFilename);
+    RTPathStripExt(pszOldFullName);
 
     /* --- Up to this point we have not done any damage yet. --- */
@@ -4022 +4032 @@
     /* Save the old name for easy access to the old descriptor file. */
     pszOldDescName = RTStrDup(pImage->pszFilename);
-
-    /* Rename the extents. */
+    /* Save old image name. */
+    pszOldImageName = pImage->pszFilename;
+
+    /* Update the descriptor with modified extent names. */
     for (i = 0, line = pImage->Descriptor.uFirstExtent;
         i < cExtents;
         i++, line = pImage->Descriptor.aNextLines[line])
     {
-        PVMDKEXTENT pExtent = &pImage->pExtents[i];
         /* Assume that vmdkStrReplace will fail. */
         rc = VERR_NO_MEMORY;
         /* Update the descriptor. */
         apszNewLines[i] = vmdkStrReplace(pImage->Descriptor.aLines[line],
-            pszOldBasename, pszNewBasename);
+            pszOldBaseName, pszNewBaseName);
         if (!apszNewLines[i])
             goto rollback;
         pImage->Descriptor.aLines[line] = apszNewLines[i];
+    }
+    /* Make sure the descriptor gets written back. */
+    pImage->Descriptor.fDirty = true;
+    /* Flush the descriptor now, in case it is embedded. */
+    vmdkFlushImage(pImage);
+
+    /* Close and rename/move extents. */
+    for (i = 0; i < cExtents; i++)
+    {
+        PVMDKEXTENT pExtent = &pImage->pExtents[i];
         /* Compose new name for the extent. */
         apszNewName[i] = vmdkStrReplace(pExtent->pszFullname,
-            pszOldBasename, pszNewBasename);
+            pszOldFullName, pszNewFullName);
         if (!apszNewName[i])
             goto rollback;
@@ -4051 +4072 @@
         apszOldName[i] = RTStrDup(pExtent->pszFullname);
     }
-
-    /* Make sure the descriptor gets written back. */
-    pImage->Descriptor.fDirty = true;
-    /* Release all old stuff and write back the descriptor. */
+    /* Release all old stuff. */
     vmdkFreeImage(pImage, false);
 
@@ -4062 +4080 @@
      * storing descriptor's names.
      */
-    apszNewName[cExtents] = RTPathFilename(pszFilename);
+    apszNewName[cExtents] = RTStrDup(pszFilename);
     /* Rename the descriptor file if it's separate. */
     if (!fEmbeddedDesc)
@@ -4094 +4112 @@
             vmdkFreeImage(pImage, false);
         }
-        /* Rename files back and free the memory. */
-        for (i = 0; i < cExtents + 1; i++)
+        /* Rename files back. */
+        for (i = 0; i <= cExtents; i++)
         {
             if (apszOldName[i])
@@ -4101 +4119 @@
                 rrc = RTFileMove(apszNewName[i], apszOldName[i], 0);
                 AssertRC(rrc);
-                RTStrFree(apszOldName[i]);
             }
-            if (apszNewName[i])
-                RTStrFree(apszNewName[i]);
-            if (apszNewLines[i])
-                RTStrFree(apszNewLines[i]);
         }
         /* Restore the old descriptor. */
@@ -4123 +4136 @@
         vmdkWriteDescriptor(pImage);
         vmdkFileClose(pImage, &pFile, false);
-        RTStrFree(pszOldDescName);
+        /* Get rid of the stuff we implanted. */
+        pImage->pExtents = NULL;
+        pImage->pFile = NULL;
         /* Re-open the image back. */
+        pImage->pszFilename = pszOldImageName;
         rrc = vmdkOpenImage(pImage, pImage->uOpenFlags);
         AssertRC(rrc);
@@ -4134 +4150 @@
             RTStrFree(DescriptorCopy.aLines[i]);
     if (apszOldName)
+    {
+        for (i = 0; i <= cExtents; i++)
+            if (apszOldName[i])
+                RTStrFree(apszOldName[i]);
         RTMemTmpFree(apszOldName);
+    }
     if (apszNewName)
+    {
+        for (i = 0; i <= cExtents; i++)
+            if (apszNewName[i])
+                RTStrFree(apszNewName[i]);
         RTMemTmpFree(apszNewName);
+    }
     if (apszNewLines)
+    {
+        for (i = 0; i < cExtents; i++)
+            if (apszNewLines[i])
+                RTStrFree(apszNewLines[i]);
         RTMemTmpFree(apszNewLines);
+    }
+    if (pszOldDescName)
+        RTStrFree(pszOldDescName);
+    if (pszOldBaseName)
+        RTStrFree(pszOldBaseName);
+    if (pszNewBaseName)
+        RTStrFree(pszNewBaseName);
+    if (pszOldFullName)
+        RTStrFree(pszOldFullName);
+    if (pszNewFullName)
+        RTStrFree(pszNewFullName);
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;