Changeset 37780 in vbox

Timestamp:

Jul 5, 2011 12:55:13 PM (13 years ago)

Author:

vboxsync

Message:

Storage/DrvHostBase: add generic unmount implementation, so that host floppy unmount works
Main/Console: fix swapped error messages for medium change

Location:

trunk/src/VBox

Files:

• Devices/Storage/DrvHostBase.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ -466 +466 @@
 static DECLCALLBACK(int) drvHostBaseUnmount(PPDMIMOUNT pInterface, bool fForce, bool fEject)
 {
-     LogFlow(("drvHostBaseUnmount: returns VERR_NOT_SUPPORTED\n"));
-     return VERR_NOT_SUPPORTED;
+    /* While we're not mountable (see drvHostBaseMount), we're unmountable. */
+    PDRVHOSTBASE pThis = PDMIMOUNT_2_DRVHOSTBASE(pInterface);
+    RTCritSectEnter(&pThis->CritSect);
+
+    /*
+     * Validate state.
+     */
+    int rc = VINF_SUCCESS;
+    if (!pThis->fLocked || fForce)
+    {
+        /* Unlock drive if necessary. */
+        if (pThis->fLocked)
+        {
+            if (pThis->pfnDoLock)
+                rc = pThis->pfnDoLock(pThis, false);
+            if (RT_SUCCESS(rc))
+                pThis->fLocked = false;
+        }
+
+        /*
+         * Media is no longer present.
+         */
+        DRVHostBaseMediaNotPresent(pThis);
+    }
+    else
+    {
+        Log(("drvHostiBaseUnmount: Locked\n"));
+        rc = VERR_PDM_MEDIA_LOCKED;
+    }
+
+    RTCritSectLeave(&pThis->CritSect);
+    LogFlow(("drvHostBaseUnmount: returns %Rrc\n", rc));
+    return rc;
 }
 

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -3512 +3512 @@
     }
 
-    if (!pMedium)
+    if (pMedium)
         return setError(E_FAIL,
                         tr("Could not mount the media/drive '%ls' (%Rrc)"),