Changeset 74937 in vbox

Timestamp:

Oct 19, 2018 9:50:40 AM (6 years ago)

Author:

vboxsync

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

125951

Message:

Main/MediumIO: Fix progress reporting when streaming the disk image

File:

• trunk/src/VBox/Main/src-server/MediumIOImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/MediumIOImpl.cpp

@@ -119 +119 @@
         if (FAILED(mRC))
             return;
-
-        /* Set up a per-operation progress interface, can be used freely (for
-         * binary operations you can use it either on the source or target). */
-        if (mProgress)
-        {
-            mVDIfProgress.pfnProgress = pProgress->i_vdProgressCallback;
-            int vrc = VDInterfaceAdd(&mVDIfProgress.Core,
-                                     "Medium::Task::vdInterfaceProgress",
-                                     VDINTERFACETYPE_PROGRESS,
-                                     mProgress,
-                                     sizeof(mVDIfProgress),
-                                     &mVDOperationIfaces);
-            AssertRC(vrc);
-            if (RT_FAILURE(vrc))
-                mRC = E_FAIL;
-        }
     }
 
@@ -171 +155 @@
     }
 
-    PVDINTERFACE mVDOperationIfaces;
-
     const ComObjPtr<MediumIO> mMediumIO;
     AutoCaller mMediumCaller;
@@ -187 +169 @@
 
     const ComObjPtr<Progress> mProgress;
-
-    VDINTERFACEPROGRESS mVDIfProgress;
 
     /* Must have a strong VirtualBox reference during a task otherwise the
@@ -436 +416 @@
     HRESULT hrc = S_OK;
     VDINTERFACEIO IfsOutputIO;
+    VDINTERFACEPROGRESS IfsProgress;
     PVDINTERFACE pIfsOp = NULL;
     PVDISK pDstDisk;
+
+    if (mProgress)
+    {
+        IfsProgress.pfnProgress = pProgress->i_vdProgressCallback;
+        int vrc = VDInterfaceAdd(&IfsProgress.Core,
+                                 "Medium::StreamTask::vdInterfaceProgress",
+                                 VDINTERFACETYPE_PROGRESS,
+                                 mProgress,
+                                 sizeof(IfsProgress),
+                                 &pIfsOp);
+    }
 
     IfsOutputIO.pfnOpen                   = i_vdStreamOpen;