Changeset 76240 in vbox for trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp

Timestamp:

Dec 14, 2018 8:34:20 PM (6 years ago)

Author:

vboxsync

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

127510

Message:

Main: bugref:6913: had to revert all changes for the defect because of crashing VBoxSVC on MacOS

File:

• trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (modified) (9 diffs)

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

@@ -16 +16 @@
  */
 
-#include <set>
-#include <map>
 #include "MachineImplCloneVM.h"
 
@@ -732 +730 @@
                                           pMediumLockList,
                                           NULL /* aProgress */,
-                                          true /* aWait */,
-                                          false /* aNotify */);
+                                          true /* aWait */);
         delete pMediumLockList;
         if (FAILED(rc)) throw rc;
@@ -1019 +1016 @@
     RTCList<ComObjPtr<Medium> > newMedia;   /* All created images */
     RTCList<Utf8Str> newFiles;              /* All extra created files (save states, ...) */
-    std::set<ComObjPtr<Medium> > pMediumsForNotify;
-    std::map<Guid, DeviceType_T> uIdsForNotify;
     try
     {
@@ -1158 +1153 @@
                         /* diff image has to be used... */
                         pNewParent = pDiff;
-                        pMediumsForNotify.insert(pDiff->i_getParent());
-                        uIdsForNotify[pDiff->i_getId()] = pDiff->i_getDeviceType();
                     }
                     else
@@ -1291 +1284 @@
                                                    progress2.asOutParam(),
                                                    uSrcParentIdx,
-                                                   uTrgParentIdx,
-                                                   false /* aNotify */);
+                                                   uTrgParentIdx);
                         srcLock.acquire();
                         if (FAILED(rc)) throw rc;
@@ -1326 +1318 @@
                          * chain. */
                         pNewParent = pTarget;
-                        uIdsForNotify[pTarget->i_getId()] = pTarget->i_getDeviceType();
                     }
                 }
@@ -1365 +1356 @@
                     /* diff image has to be used... */
                     pNewParent = pDiff;
-                    pMediumsForNotify.insert(pDiff->i_getParent());
-                    uIdsForNotify[pDiff->i_getId()] = pDiff->i_getDeviceType();
                 }
                 else
@@ -1545 +1534 @@
             const ComObjPtr<Medium> &pMedium = newMedia.at(i - 1);
             mrc = pMedium->i_deleteStorage(NULL /* aProgress */,
-                                           true /* aWait */,
-                                           false /* aNotify */);
+                                           true /* aWait */);
             pMedium->Close();
         }
@@ -1558 +1546 @@
         p->mParent->i_saveModifiedRegistries();
     }
-    else
-    {
-        for (std::map<Guid, DeviceType_T>::const_iterator it = uIdsForNotify.begin();
-             it != uIdsForNotify.end();
-             ++it)
-        {
-            p->mParent->i_onMediumRegistered(it->first, it->second, TRUE);
-        }
-        for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediumsForNotify.begin();
-             it != pMediumsForNotify.end();
-             ++it)
-        {
-            if (it->isNotNull())
-                p->mParent->i_onMediumConfigChanged(*it);
-        }
-    }
 
     return mrc;