Changeset 33108 in vbox

Timestamp:

Oct 13, 2010 2:31:56 PM (14 years ago)

Author:

vboxsync

Message:

Main: crash fix for media unmounting (yesterday's regression)

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -3310 +3310 @@
 {
     LogFlowFunc(("pConsole=%p uInstance=%u pszDevice=%p:{%s} enmBus=%u, aMediumAtt=%p, fForce=%d\n",
-                 pConsole, uInstance, pcszDevice, enmBus, fForce));
+                 pConsole, uInstance, pcszDevice, pcszDevice, enmBus, aMediumAtt, fForce));
 
     AssertReturn(pConsole, VERR_INVALID_PARAMETER);

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3860 +3860 @@
             oldmedium->removeBackReference(mData->mUuid);
         if (!medium.isNull())
+        {
             medium->addBackReference(mData->mUuid);
+            // and decide which medium registry to use now that the medium is attached:
+            if (mData->pMachineConfigFile->canHaveOwnMediaRegistry())
+                // machine XML is VirtualBox 4.0 or higher:
+                medium->addRegistry(getId());        // machine UUID
+            else
+                medium->addRegistry(mParent->getGlobalRegistryId()); // VirtualBox global registry UUID
+        }
+
         pAttach->updateMedium(medium);
-
-        // and decide which medium registry to use now that the medium is attached:
-        if (mData->pMachineConfigFile->canHaveOwnMediaRegistry())
-            // machine XML is VirtualBox 4.0 or higher:
-            medium->addRegistry(getId());        // machine UUID
-        else
-            medium->addRegistry(mParent->getGlobalRegistryId()); // VirtualBox global registry UUID
 
         setModified(IsModified_Storage);