Changeset 55271 in vbox

Timestamp:

Apr 15, 2015 9:25:29 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99589

Message:

Storage: Calculate progress based on the real file size instead of virtual disk size

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -8728 +8728 @@
                 /* Get size of image. */
                 uint64_t cbSize = pImage->Backend->pfnGetSize(pImage->pBackendData);
+                uint64_t cbSizeFile = pImage->Backend->pfnGetFileSize(pImage->pBackendData);
+                uint64_t cbFileWritten = 0;
                 uint64_t uOffset = 0;
                 uint64_t cbRemaining = cbSize;
@@ -8770 +8772 @@
                             break;
                         Assert(cbThisWrite == cbThisRead);
+                        cbFileWritten += cbThisWrite;
                     }
                     else
@@ -8780 +8783 @@
                     {
                         rc2 = pIfProgress->pfnProgress(pIfProgress->Core.pvUser,
-                                                       uPercentStart + uOffset * uPercentSpan / cbSize);
+                                                       uPercentStart + cbFileWritten * uPercentSpan / cbSizeFile);
                         AssertRC(rc2); /* Cancelling this operation without leaving an inconsistent state is not possible. */
                     }