Changeset 15785 in vbox for trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

Timestamp:

Jan 5, 2009 12:34:36 AM (16 years ago)

Author:

vboxsync

Message:

VDI: Update number of bytes actually written even if the block was completely zero. Fixes cloning of VDI's (public bug #2813)

File:

• trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp (modified) (5 diffs)

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

@@ -1070 +1070 @@
     {
         rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
+        goto outfail;
     }
 
@@ -1076 +1076 @@
     {
         rc = VERR_INVALID_PARAMETER;
-        goto out;
+        goto outfail;
     }
 
@@ -1121 +1121 @@
             rc = RTFileWriteAt(pImage->File, u64Offset, pvBuf, cbToWrite, NULL);
             if (RT_FAILURE(rc))
-                goto out;
+                goto outfail;
             pImage->paBlocks[uBlock] = cBlocksAllocated;
             setImageBlocksAllocated(&pImage->Header, cBlocksAllocated + 1);
@@ -1127 +1127 @@
             rc = vdiUpdateBlockInfo(pImage, uBlock);
             if (RT_FAILURE(rc))
-                goto out;
+                goto outfail;
 
             *pcbPreRead = 0;
@@ -1148 +1148 @@
         rc = RTFileWriteAt(pImage->File, u64Offset, pvBuf, cbToWrite, NULL);
     }
+
+out:
     if (pcbWriteProcess)
         *pcbWriteProcess = cbToWrite;
 
-out:
+outfail:
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;