Changeset 29325 in vbox

Timestamp:

May 11, 2010 10:07:04 AM (15 years ago)

Author:

vboxsync

Message:

Main/Machine: fix regression due to negated bool parameter resulting in incorrec
t locking (dvds/floppies), some cleanup to reduce confusion

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (3 diffs)
• MediumImpl.cpp (modified) (10 diffs)
• include/MediumImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3072 +3072 @@
         /* Apply the normal locking logic to the entire chain. */
         MediumLockList *pMediumLockList(new MediumLockList());
-        rc = diff->createMediumLockList(true, /* fFailIfInaccessible */
-                                        true /* fMediumWritable -- really? @todo r=dj*/ ,
+        rc = diff->createMediumLockList(true /* fFailIfInaccessible */,
+                                        true /* fMediumLockWrite */,
                                         medium,
                                         *pMediumLockList);
@@ -8203 +8203 @@
 
                     MediumLockList *pMediumLockList(new MediumLockList());
-                    rc = pMedium->createMediumLockList(true, /* fFailIfInaccessible */
-                                                       false,
+                    rc = pMedium->createMediumLockList(true /* fFailIfInaccessible */,
+                                                       false /* fMediumLockWrite */,
                                                        NULL,
                                                        *pMediumLockList);
@@ -10819 +10819 @@
         if (pMedium != NULL)
         {
-            bool fIsReadOnlyImage = (   devType == DeviceType_DVD
-                                     || devType == DeviceType_Floppy);
-            mrc = pMedium->createMediumLockList(!fIsReadOnlyImage /* fFailIfInaccessible */,
-                                                fIsReadOnlyImage, /* fReadOnly */
+            bool fIsReadOnlyImage = (devType == DeviceType_DVD);
+            bool fIsVitalImage = (devType == DeviceType_HardDisk);
+            mrc = pMedium->createMediumLockList(fIsVitalImage /* fFailIfInaccessible */,
+                                                !fIsReadOnlyImage /* fMediumLockWrite */,
                                                 NULL,
                                                 *pMediumLockList);

trunk/src/VBox/Main/MediumImpl.cpp

@@ -2202 +2202 @@
     MediumLockList *pMediumLockList(new MediumLockList());
     HRESULT rc = diff->createMediumLockList(true /* fFailIfInaccessible */,
-                                            true /* fMediumWritable */,
+                                            true /* fMediumLockWrite */,
                                             this,
                                             *pMediumLockList);
@@ -2293 +2293 @@
         MediumLockList *pSourceMediumLockList(new MediumLockList());
         rc = createMediumLockList(true /* fFailIfInaccessible */,
-                                  false /* fMediumWritable */,
+                                  false /* fMediumLockWrite */,
                                   NULL,
                                   *pSourceMediumLockList);
@@ -2305 +2305 @@
         MediumLockList *pTargetMediumLockList(new MediumLockList());
         rc = pTarget->createMediumLockList(true /* fFailIfInaccessible */,
-                                           true /* fMediumWritable */,
+                                           true /* fMediumLockWrite */,
                                            pParent,
                                            *pTargetMediumLockList);
@@ -2395 +2395 @@
         MediumLockList *pMediumLockList(new MediumLockList());
         rc = createMediumLockList(true /* fFailIfInaccessible */ ,
-                                  true /* fMediumWritable */,
+                                  true /* fMediumLockWrite */,
                                   NULL,
                                   *pMediumLockList);
@@ -2490 +2490 @@
         MediumLockList *pMediumLockList(new MediumLockList());
         rc = createMediumLockList(true /* fFailIfInaccessible */,
-                                  true /* fMediumWritable */,
+                                  true /* fMediumLockWrite */,
                                   NULL,
                                   *pMediumLockList);
@@ -3111 +3111 @@
  * @note Locks the medium tree for reading.
  *
- * @param fMediumWritable   Whether to associate a write lock with this medium.
+ * @param fFailIfInaccessible Whether to refuse inaccessible media.
+ * @param fMediumLockWrite  Whether to associate a write lock with this medium.
  * @param pToBeParent       Medium which will become the parent of this medium.
  * @param mediumLockList    Where to store the resulting list.
  */
 HRESULT Medium::createMediumLockList(bool fFailIfInaccessible,
-                                     bool fMediumWritable,
+                                     bool fMediumLockWrite,
                                      Medium *pToBeParent,
                                      MediumLockList &mediumLockList)
@@ -3176 +3177 @@
 
         if (pMedium == this)
-            mediumLockList.Prepend(pMedium, fMediumWritable);
+            mediumLockList.Prepend(pMedium, fMediumLockWrite);
         else
             mediumLockList.Prepend(pMedium, false);
@@ -3911 +3912 @@
         MediumLockList *pMediumLockList(new MediumLockList());
         rc = createMediumLockList(true /* fFailIfInaccessible */,
-                                  true /* fMediumWritable */,
+                                  true /* fMediumLockWrite */,
                                   NULL,
                                   *pMediumLockList);
@@ -4299 +4300 @@
         if (fMergeForward)
             rc = pTarget->createMediumLockList(true /* fFailIfInaccessible */,
-                                               true /* fMediumWritable */,
+                                               true /* fMediumLockWrite */,
                                                NULL,
                                                *aMediumLockList);
         else
             rc = createMediumLockList(true /* fFailIfInaccessible */,
-                                      false /* fMediumWritable */,
+                                      false /* fMediumLockWrite */,
                                       NULL,
                                       *aMediumLockList);
@@ -5008 +5009 @@
     MediumLockList mediumLockList;
     HRESULT rc = createMediumLockList(true /* fFailIfInaccessible */,
-                                      false /* fMediumWritable */,
+                                      false /* fMediumLockWrite */,
                                       this,
                                       mediumLockList);

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

@@ -189 +189 @@
 
     HRESULT createMediumLockList(bool fFailIfInaccessible,
-                                 bool fMediumWritable,
+                                 bool fMediumLockWrite,
                                  Medium *pToBeParent,
                                  MediumLockList &mediumLockList);