Changeset 71581 in vbox for trunk/src/VBox/Main/include

Timestamp:

Mar 30, 2018 10:38:27 AM (7 years ago)

Author:

vboxsync

Message:

bugref:8345. Attempt to fix the subtle bug with MEDIUMTASK structure initialization.

File:

• trunk/src/VBox/Main/include/MachineImplMoveVM.h (modified) (5 diffs)

trunk/src/VBox/Main/include/MachineImplMoveVM.h

@@ -37 +37 @@
 typedef struct
 {
+    bool                    fSnapshot;
     Utf8Str                 strBaseName;
     ComPtr<IMedium>         pMedium;
     uint32_t                uIdx;
     ULONG                   uWeight;
-    bool                    fSnapshot;
-} MEDIUMTASK;
+} MEDIUMTASKMOVE;
 
 typedef struct
 {
-    RTCList<MEDIUMTASK>     chain;
+    RTCList<MEDIUMTASKMOVE>     chain;
     DeviceType_T            devType;
     bool                    fCreateDiffs;
     bool                    fAttachLinked;
-} MEDIUMTASKCHAIN;
+} MEDIUMTASKCHAINMOVE;
 
 typedef struct
@@ -57 +57 @@
     Utf8Str                 strSaveStateFile;
     ULONG                   uWeight;
-} SAVESTATETASK;
+} SAVESTATETASKMOVE;
 
 struct fileList_t;
@@ -87 +87 @@
     static void i_MoveVMThreadTask(MachineMoveVM* task);
 
-    RTCList<MEDIUMTASKCHAIN>    llMedias;
-    RTCList<SAVESTATETASK>      llSaveStateFiles;
-    std::map<Utf8Str, MEDIUMTASK>     finalMediumsMap;
-    std::map<Utf8Str, SAVESTATETASK>  finalSaveStateFilesMap;
+    RTCList<MEDIUMTASKCHAINMOVE>    llMedias;
+    RTCList<SAVESTATETASKMOVE>      llSaveStateFiles;
+    std::map<Utf8Str, MEDIUMTASKMOVE>     finalMediumsMap;
+    std::map<Utf8Str, SAVESTATETASKMOVE>  finalSaveStateFilesMap;
     std::map<VBoxFolder_t, Utf8Str> vmFolders;
 
@@ -111 +111 @@
     inline HRESULT queryBaseName(const ComPtr<IMedium> &pMedium, Utf8Str &strBaseName) const;
     HRESULT queryMediasForAllStates(const std::vector<ComObjPtr<Machine> > &aMachineList);
-    void updateProgressStats(MEDIUMTASKCHAIN &mtc, ULONG &uCount, ULONG &uTotalWeight) const;
+    void updateProgressStats(MEDIUMTASKCHAINMOVE &mtc, ULONG &uCount, ULONG &uTotalWeight) const;
     HRESULT addSaveState(const ComObjPtr<Machine> &machine);
     void printStateFile(settings::SnapshotsList &snl);
@@ -117 +117 @@
     HRESULT getFolderSize(const Utf8Str& strRootFolder, uint64_t& size);
     HRESULT deleteFiles(const RTCList<Utf8Str>& listOfFiles);
-    HRESULT updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASK>& listOfFiles,
+    HRESULT updatePathsToStateFiles(const std::map<Utf8Str, SAVESTATETASKMOVE>& listOfFiles,
                                     const Utf8Str& sourcePath, const Utf8Str& targetPath);
-    HRESULT moveAllDisks(const std::map<Utf8Str, MEDIUMTASK>& listOfDisks, const Utf8Str* strTargetFolder = NULL);
-    HRESULT restoreAllDisks(const std::map<Utf8Str, MEDIUMTASK>& listOfDisks);
+    HRESULT moveAllDisks(const std::map<Utf8Str, MEDIUMTASKMOVE>& listOfDisks, const Utf8Str* strTargetFolder = NULL);
+    HRESULT restoreAllDisks(const std::map<Utf8Str, MEDIUMTASKMOVE>& listOfDisks);
     bool isMediumTypeSupportedForMoving(const ComPtr<IMedium> &pMedium);
 };