Changeset 86125 in vbox for trunk/src/VBox

Timestamp:

Sep 14, 2020 5:55:07 PM (4 years ago)

Author:

vboxsync

Message:

Main: bugref:9623: Restricted the scope of the multi attaching the same image twice by DVD only.

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (2 diffs)

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

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

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

@@ -4341 +4341 @@
     {
         AutoReadLock arlock(this COMMA_LOCKVAL_SRC_POS);
-        fDvd = m->type == MediumType_Readonly || m->devType == DeviceType_DVD;
+        /*
+         *  Check the medium is DVD and readonly. It's for the case if DVD
+         *  will be able to be writable sometime in the future.
+         */
+        fDvd = m->type == MediumType_Readonly && m->devType == DeviceType_DVD;
     }
 
@@ -4350 +4354 @@
     if (aSnapshotId.isZero())
     {
-        // Allow MediumType_Readonly mediums and DVD in particular to be attached twice.
+        // Allow DVD having MediumType_Readonly to be attached twice.
         // (the medium already had been added to back reference)
         if (fDvd)