Changeset 35429 in vbox

Timestamp:

Jan 7, 2011 2:42:24 PM (14 years ago)

Author:

vboxsync

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

69300

Message:

Main: fix bug that dvd/floppy host drives would not be restored from machine settings but always result in empty drives

Location:

trunk/src/VBox/Main

Files:

• include/HostImpl.h (modified) (1 diff)
• src-server/HostImpl.cpp (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)

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

@@ -109 +109 @@
 
     HRESULT getDrives(DeviceType_T mediumType, bool fRefresh, MediaList *&pll);
-    HRESULT findHostDrive(DeviceType_T mediumType, const Guid &uuid, bool fRefresh, ComObjPtr<Medium> &pMedium);
+    HRESULT findHostDriveById(DeviceType_T mediumType, const Guid &uuid, bool fRefresh, ComObjPtr<Medium> &pMedium);
+    HRESULT findHostDriveByName(DeviceType_T mediumType, const Utf8Str &strLocationFull, bool fRefresh, ComObjPtr<Medium> &pMedium);
 
 #ifdef VBOX_WITH_USB

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

@@ -1684 +1684 @@
  * @return VBOX_E_OBJECT_NOT_FOUND if not found, or S_OK if found, or errors from getDrives().
  */
-HRESULT Host::findHostDrive(DeviceType_T mediumType,
-                            const Guid &uuid,
-                            bool fRefresh,
-                            ComObjPtr<Medium> &pMedium)
+HRESULT Host::findHostDriveById(DeviceType_T mediumType,
+                                const Guid &uuid,
+                                bool fRefresh,
+                                ComObjPtr<Medium> &pMedium)
 {
     MediaList *pllMedia;
@@ -1701 +1701 @@
             Medium *pThis = *it;
             if (pThis->getId() == uuid)
+            {
+                pMedium = pThis;
+                return S_OK;
+            }
+        }
+    }
+
+    return VBOX_E_OBJECT_NOT_FOUND;
+}
+
+/**
+ * Goes through the list of host drives that would be returned by getDrives()
+ * and looks for a host drive with the given name. If found, it sets pMedium
+ * to that drive; otherwise returns VBOX_E_OBJECT_NOT_FOUND.
+ *
+ * @param mediumType Must be DeviceType_DVD or DeviceType_Floppy.
+ * @param strLocationFull Name (path) of host drive to look for.
+ * @param fRefresh Whether to refresh the host drives list (see getDrives())
+ * @param pMedium Medium object, if found…
+ * @return VBOX_E_OBJECT_NOT_FOUND if not found, or S_OK if found, or errors from getDrives().
+ */
+HRESULT Host::findHostDriveByName(DeviceType_T mediumType,
+                                  const Utf8Str &strLocationFull,
+                                  bool fRefresh,
+                                  ComObjPtr<Medium> &pMedium)
+{
+    MediaList *pllMedia;
+
+    AutoWriteLock wlock(m->drivesLock COMMA_LOCKVAL_SRC_POS);
+    HRESULT rc = getDrives(mediumType, fRefresh, pllMedia);
+    if (SUCCEEDED(rc))
+    {
+        for (MediaList::iterator it = pllMedia->begin();
+             it != pllMedia->end();
+             ++it)
+        {
+            Medium *pThis = *it;
+            if (pThis->getLocationFull() == strLocationFull)
             {
                 pMedium = pThis;

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

@@ -7529 +7529 @@
             case DeviceType_Floppy:
             case DeviceType_DVD:
-                rc = mParent->findRemoveableMedium(dev.deviceType, dev.uuid, false /* fRefresh */, medium);
+                if (dev.strHostDriveSrc.isNotEmpty())
+                    rc = mParent->host()->findHostDriveByName(dev.deviceType, dev.strHostDriveSrc, false /* fRefresh */, medium);
+                else
+                    rc = mParent->findRemoveableMedium(dev.deviceType, dev.uuid, false /* fRefresh */, medium);
                 if (FAILED(rc))
                     return rc;

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

@@ -2843 +2843 @@
 
     // first search for host drive with that UUID
-    HRESULT rc = m->pHost->findHostDrive(mediumType,
-                                         uuid,
-                                         fRefresh,
-                                         pMedium);
+    HRESULT rc = m->pHost->findHostDriveById(mediumType,
+                                             uuid,
+                                             fRefresh,
+                                             pMedium);
     if (rc == VBOX_E_OBJECT_NOT_FOUND)
                 // then search for an image with that UUID