Changeset 72205 in vbox for trunk/src/VBox/Main

Timestamp:

May 14, 2018 6:37:50 PM (7 years ago)

Author:

vboxsync

Message:

Main/VirtualBox+Machine: Change medium registry behavior, put new media into global registry until it is associated with a VM. This avoids the annoying glitch that the media registry can forget something unexpectedly if VBoxSVC terminates.

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (3 diffs)
• VirtualBoxImpl.cpp (modified) (3 diffs)

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

@@ -10817 +10817 @@
     // decide which medium registry to use now that the medium is attached:
     Guid uuid;
-    if (mData->pMachineConfigFile->canHaveOwnMediaRegistry())
+    bool fCanHaveOwnMediaRegistry = mData->pMachineConfigFile->canHaveOwnMediaRegistry();
+    if (fCanHaveOwnMediaRegistry)
         // machine XML is VirtualBox 4.0 or higher:
         uuid = i_getId();     // machine UUID
@@ -10823 +10824 @@
         uuid = mParent->i_getGlobalRegistryId(); // VirtualBox global registry UUID
 
+    if (fCanHaveOwnMediaRegistry && pMedium->i_removeRegistry(mParent->i_getGlobalRegistryId()))
+        mParent->i_markRegistryModified(mParent->i_getGlobalRegistryId());
     if (pMedium->i_addRegistry(uuid))
         mParent->i_markRegistryModified(uuid);
@@ -10832 +10835 @@
         /* Tree lock needed by Medium::addRegistry when recursing. */
         AutoReadLock treeLock(&mParent->i_getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+        if (fCanHaveOwnMediaRegistry && pMedium->i_removeRegistryRecursive(mParent->i_getGlobalRegistryId()))
+        {
+            treeLock.release();
+            mParent->i_markRegistryModified(mParent->i_getGlobalRegistryId());
+            treeLock.acquire();
+        }
         if (pBase->i_addRegistryRecursive(uuid))
         {

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

@@ -4382 +4382 @@
     AssertComRCReturnRC(mediumCaller.rc());
 
+    bool fAddToGlobalRegistry = false;
     const char *pszDevType = NULL;
+    Guid regId;
     ObjectsList<Medium> *pall = NULL;
     DeviceType_T devType;
@@ -4388 +4390 @@
         AutoReadLock mediumLock(pMedium COMMA_LOCKVAL_SRC_POS);
         devType = pMedium->i_getDeviceType();
+
+        if (!pMedium->i_getFirstRegistryMachineId(regId))
+            fAddToGlobalRegistry = true;
     }
     switch (devType)
@@ -4462 +4467 @@
         Assert(!i_getMediaTreeLockHandle().isWriteLockOnCurrentThread());
         *ppMedium = pDupMedium;
+    }
+
+    if (fAddToGlobalRegistry)
+    {
+        AutoWriteLock mediumLock(pMedium COMMA_LOCKVAL_SRC_POS);
+        if (pMedium->i_addRegistry(m->uuidMediaRegistry))
+            i_markRegistryModified(m->uuidMediaRegistry);
     }