Changeset 78825 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

May 28, 2019 3:59:04 PM (6 years ago)

Author:

vboxsync

Message:

Main: bugref:6913: Fixed IMediumRegisteredEvent issues

Location:

trunk/src/VBox/Main/src-server

Files:

• SnapshotImpl.cpp (modified) (4 diffs)
• VirtualBoxImpl.cpp (modified) (5 diffs)

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

@@ -2184 +2184 @@
     Guid snapshotId;
     std::set<ComObjPtr<Medium> > pMediumsForNotify;
-    std::map<Guid, DeviceType_T> uIdsForNotify;
+    std::map<Guid, std::pair<DeviceType_T, BOOL>> uIdsForNotify;
 
     try
@@ -2311 +2311 @@
                 {
                     pMediumsForNotify.insert(pMedium->i_getParent());
-                    uIdsForNotify[pMedium->i_getId()] = pMedium->i_getDeviceType();
+                    uIdsForNotify[pMedium->i_getId()] = std::pair<DeviceType_T, BOOL>(pMedium->i_getDeviceType(), TRUE);
                 }
             }
@@ -2422 +2422 @@
             {
                 pMediumsForNotify.insert(pParent);
+                uIdsForNotify[pMedium->i_getId()] = std::pair<DeviceType_T, BOOL>(pMedium->i_getDeviceType(), FALSE);
                 pMedium->uninit();
             }
@@ -2452 +2453 @@
     {
         mParent->i_onSnapshotRestored(mData->mUuid, snapshotId);
-        for (std::map<Guid, DeviceType_T>::const_iterator it = uIdsForNotify.begin();
+        for (std::map<Guid, std::pair<DeviceType_T, BOOL>>::const_iterator it = uIdsForNotify.begin();
              it != uIdsForNotify.end();
              ++it)
         {
-            mParent->i_onMediumRegistered(it->first, it->second, TRUE);
+            mParent->i_onMediumRegistered(it->first, it->second.first, it->second.second);
         }
         for (std::set<ComObjPtr<Medium> >::const_iterator it = pMediumsForNotify.begin();

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

@@ -758 +758 @@
     AutoWriteLock treeLock(i_getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
 
+    std::map<Guid, DeviceType_T> uIdsForNotify;
+
     HRESULT rc = S_OK;
     settings::MediaList::const_iterator it;
@@ -778 +780 @@
 
         rc = i_registerMedium(pHardDisk, &pHardDisk, treeLock);
+        if (SUCCEEDED(rc))
+            uIdsForNotify[pHardDisk->i_getId()] = DeviceType_HardDisk;
         // Avoid trouble with lock/refcount, before returning or not.
         treeLock.release();
@@ -803 +807 @@
 
         rc = i_registerMedium(pImage, &pImage, treeLock);
+        if (SUCCEEDED(rc))
+            uIdsForNotify[pImage->i_getId()] = DeviceType_DVD;
         // Avoid trouble with lock/refcount, before returning or not.
         treeLock.release();
@@ -828 +834 @@
 
         rc = i_registerMedium(pImage, &pImage, treeLock);
+        if (SUCCEEDED(rc))
+            uIdsForNotify[pImage->i_getId()] = DeviceType_Floppy;
         // Avoid trouble with lock/refcount, before returning or not.
         treeLock.release();
@@ -833 +841 @@
         treeLock.acquire();
         if (FAILED(rc)) return rc;
+    }
+
+    if (SUCCEEDED(rc))
+    {
+        for (std::map<com::Guid, DeviceType_T>::const_iterator it = uIdsForNotify.begin();
+             it != uIdsForNotify.end();
+             ++it)
+        {
+            i_onMediumRegistered(it->first, it->second, TRUE);
+        }
     }