Main

Timestamp:

Aug 27, 2020 5:10:34 PM (5 years ago)

Author:

vboxsync

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

140095

Message:

Main: bugref:9623: Fixed issue causes the assertion during VBoxSVC unload. Fixed the issues during snapshots creating/deleting

Location:

trunk/src/VBox/Main/src-server

Files:

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

-              r85769
+              r85908
     if (    (pAttachTemp = i_findAttachment(*mMediumAttachments.data(), medium))
+         && !medium.isNull()
+         && !medium.isNull() && medium->i_getType() != MediumType_Readonly
+         &&  medium->i_getDeviceType() != DeviceType_DVD
+       )
         return setError(VBOX_E_OBJECT_IN_USE,

-              r85820
+              r85908
+    }
+    // if the caller has not supplied a snapshot ID, then we're attaching
+    // to a machine a medium which represents the machine's current state,
+    // so set the flag
+    if (aSnapshotId.isZero())
+    {
         // Allow MediumType_Readonly mediums and DVD in particular to be attached twice.
 …
             return S_OK;
+        }
+    }
+    // if the caller has not supplied a snapshot ID, then we're attaching
+    // to a machine a medium which represents the machine's current state,
+    // so set the flag
+    if (aSnapshotId.isZero())
+    {
         /* sanity: no duplicate attachments */
         if (it->fInCurState)
 …
     // otherwise: a snapshot medium is being attached
     /* sanity: no duplicate attachments */
+    /* sanity: no duplicate attachments except MediumType_Readonly (DVD) */
     for (GuidList::const_iterator jt = it->llSnapshotIds.begin();
          jt != it->llSnapshotIds.end();
 …
         const Guid &idOldSnapshot = *jt;
+        if (idOldSnapshot == aSnapshotId)
+        if (   idOldSnapshot == aSnapshotId
+            && m->type != MediumType_Readonly
+            && m->devType != DeviceType_DVD
+           )
+        {
 #ifdef DEBUG

Note: See TracChangeset for help on using the changeset viewer.