Changeset 81394 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 21, 2019 9:16:17 AM (5 years ago)

Author:

vboxsync

Message:

Main/MachineImplMoveVM: Putting all Machine object references in a global variable is impossible, since multiple VM move operations can operate concurrently.

Location:

trunk/src/VBox/Main

Files:

• include/MachineImplMoveVM.h (modified) (2 diffs)
• src-server/MachineImplMoveVM.cpp (modified) (9 diffs)

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

@@ -66 +66 @@
 class MachineMoveVM : public ThreadTask
 {
+    std::vector<ComObjPtr<Machine> >        machineList;
     RTCList<MEDIUMTASKCHAINMOVE>            m_llMedias;
     RTCList<SAVESTATETASKMOVE>              m_llSaveStateFiles;
@@ -110 +111 @@
 
 private:
-    HRESULT createMachineList(const ComPtr<ISnapshot> &pSnapshot, std::vector<ComObjPtr<Machine> > &aMachineList) const;
+    HRESULT createMachineList(const ComPtr<ISnapshot> &pSnapshot);
     inline HRESULT queryBaseName(const ComPtr<IMedium> &pMedium, Utf8Str &strBaseName) const;
-    HRESULT queryMediasForAllStates(const std::vector<ComObjPtr<Machine> > &aMachineList);
+    HRESULT queryMediasForAllStates();
     void updateProgressStats(MEDIUMTASKCHAINMOVE &mtc, ULONG &uCount, ULONG &uTotalWeight) const;
     HRESULT addSaveState(const ComObjPtr<Machine> &machine);

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

@@ -30 +30 @@
 #include "LoggingNew.h"
 
-/* This variable is global and used in the different places so it must be cleared each time before usage to avoid failure */
-std::vector<ComObjPtr<Machine> > machineList;
-
 typedef std::multimap<Utf8Str, Utf8Str> list_t;
 typedef std::multimap<Utf8Str, Utf8Str>::const_iterator cit_t;
@@ -292 +289 @@
     Utf8Str strTargetImageName;
 
-    /* Global variable (defined at the beginning of file), so clear it before usage */
-    machineList.clear();
     machineList.push_back(m_pMachine);
 
@@ -311 +306 @@
             if (FAILED(hrc))
                 return hrc;
-            hrc = createMachineList(pSnapshot, machineList);
+            hrc = createMachineList(pSnapshot);
             if (FAILED(hrc))
                 return hrc;
@@ -321 +316 @@
 
     /* The lists m_llMedias and m_llSaveStateFiles are filled in the queryMediasForAllStates() */
-    hrc = queryMediasForAllStates(machineList);
+    hrc = queryMediasForAllStates();
     if (FAILED(hrc))
         return hrc;
@@ -1322 +1317 @@
 }
 
-HRESULT MachineMoveVM::createMachineList(const ComPtr<ISnapshot> &pSnapshot,
-                                         std::vector<ComObjPtr<Machine> > &aMachineList) const
+HRESULT MachineMoveVM::createMachineList(const ComPtr<ISnapshot> &pSnapshot)
 {
     Bstr name;
@@ -1332 +1326 @@
     rc = pSnapshot->COMGETTER(Machine)(l_pMachine.asOutParam());
     if (FAILED(rc)) return rc;
-    aMachineList.push_back((Machine*)(IMachine*)l_pMachine);
+    machineList.push_back((Machine*)(IMachine*)l_pMachine);
 
     SafeIfaceArray<ISnapshot> sfaChilds;
@@ -1339 +1333 @@
     for (size_t i = 0; i < sfaChilds.size(); ++i)
     {
-        rc = createMachineList(sfaChilds[i], aMachineList);
+        rc = createMachineList(sfaChilds[i]);
         if (FAILED(rc)) return rc;
     }
@@ -1346 +1340 @@
 }
 
-HRESULT MachineMoveVM::queryMediasForAllStates(const std::vector<ComObjPtr<Machine> > &aMachineList)
+HRESULT MachineMoveVM::queryMediasForAllStates()
 {
     /* In this case we create a exact copy of the original VM. This means just
@@ -1352 +1346 @@
      * list. */
     HRESULT rc = S_OK;
-    for (size_t i = 0; i < aMachineList.size(); ++i)
-    {
-        const ComObjPtr<Machine> &machine = aMachineList.at(i);
+    for (size_t i = 0; i < machineList.size(); ++i)
+    {
+        const ComObjPtr<Machine> &machine = machineList.at(i);
 
         /* Add all attachments (and their parents) of the different