Changeset 27623 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 23, 2010 12:06:34 PM (15 years ago)

Author:

vboxsync

Message:

VMDK: Fix OVF export and import

File:

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

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

@@ -477 +477 @@
 {
     /* File where the data is stored. */
-    RTFILE File;
+    PVMDKFILE File;
     /* Total size of the data to read. */
     size_t cbSize;
@@ -490 +490 @@
 {
     /* File where the data is to be stored. */
-    RTFILE File;
+    PVMDKFILE File;
     /* Offset in the file to write at. */
     uint64_t uFileOffset;
@@ -812 +812 @@
     }
     cbBuf = RT_MIN(cbBuf, pInflateState->cbSize);
-    int rc = RTFileReadAt(pInflateState->File, pInflateState->uFileOffset, pvBuf, cbBuf, NULL);
+    int rc = vmdkFileReadAt(pInflateState->File, pInflateState->uFileOffset, pvBuf, cbBuf, NULL);
     if (RT_FAILURE(rc))
         return rc;
@@ -849 +849 @@
         if (uMarker == VMDK_MARKER_IGNORE)
             cbMarker -= sizeof(Marker.uType);
-        rc = RTFileReadAt(pVmdkFile->File, uOffset, &Marker, cbMarker, NULL);
+        rc = vmdkFileReadAt(pVmdkFile, uOffset, &Marker, cbMarker, NULL);
         if (RT_FAILURE(rc))
             return rc;
@@ -891 +891 @@
             }
         }
-        InflateState.File = pVmdkFile->File;
+        InflateState.File = pVmdkFile;
         InflateState.cbSize = cbComp;
         InflateState.uFileOffset = uCompOffset;
@@ -926 +926 @@
     if (!cbBuf)
         return VINF_SUCCESS;
-    int rc = RTFileWriteAt(pDeflateState->File, pDeflateState->uFileOffset, pvBuf, cbBuf, NULL);
+    int rc = vmdkFileWriteAt(pDeflateState->File, pDeflateState->uFileOffset, pvBuf, cbBuf, NULL);
     if (RT_FAILURE(rc))
         return rc;
@@ -969 +969 @@
             return VERR_NOT_IMPLEMENTED;
         }
-        DeflateState.File = pVmdkFile->File;
+        DeflateState.File = pVmdkFile;
         DeflateState.uFileOffset = uCompOffset;
         DeflateState.iOffset = -1;
@@ -988 +988 @@
              * guarantees that data gets only appended. */
             Assert(DeflateState.uFileOffset > uCompOffset);
-            rc = RTFileSetSize(pVmdkFile->File, DeflateState.uFileOffset);
+            rc = vmdkFileSetSize(pVmdkFile, DeflateState.uFileOffset);
 
             if (uMarker == VMDK_MARKER_IGNORE)
@@ -994 +994 @@
                 /* Compressed grain marker. */
                 Marker.cbSize = RT_H2LE_U32(DeflateState.iOffset);
-                rc = RTFileWriteAt(pVmdkFile->File, uOffset, &Marker, 12, NULL);
+                rc = vmdkFileWriteAt(pVmdkFile, uOffset, &Marker, 12, NULL);
                 if (RT_FAILURE(rc))
                     return rc;
@@ -1029 +1029 @@
                                                                pVmdkFile->pStorage);
         else
-            rc2 = RTFileClose(pVmdkFile->File);
-
-        if (RT_SUCCESS(rc) && pVmdkFile->fDelete)
-            rc2 = RTFileDelete(pVmdkFile->pszFilename);
-        RTStrFree((char *)(void *)pVmdkFile->pszFilename);
-        RTMemFree(pVmdkFile);
+            rc2 = vmdkFileClose(pImage, &pVmdkFile, pVmdkFile->fDelete);
+
         if (RT_SUCCESS(rc))
             rc = rc2;