Changeset 3113 in vbox for trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

Timestamp:

Jun 14, 2007 6:29:54 PM (17 years ago)

Author:

vboxsync

Message:

Implement virtual paperclip (forced unmounting of media, currently
unused) and non-fatal error when media is not available on powerup.

File:

• trunk/src/VBox/Devices/Storage/DrvHostBase.cpp (modified) (16 diffs)

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

@@ -457 +457 @@
 
 /** @copydoc PDMIMOUNT::pfnUnmount */
-static DECLCALLBACK(int) drvHostBaseUnmount(PPDMIMOUNT pInterface)
+static DECLCALLBACK(int) drvHostBaseUnmount(PPDMIMOUNT pInterface, bool fForce)
 {
      LogFlow(("drvHostBaseUnmount: returns VERR_NOT_SUPPORTED\n"));
@@ -567 +567 @@
 /**
  * Gets the BSD Name (/dev/disc[0-9]+) for the service.
- * 
- * This is done by recursing down the I/O registry until we hit upon an entry 
- * with a BSD Name. Usually we find it two levels down. (Further down under 
+ *
+ * This is done by recursing down the I/O registry until we hit upon an entry
+ * with a BSD Name. Usually we find it two levels down. (Further down under
  * the IOCDPartitionScheme, the volume (slices) BSD Name is found. We don't
  * seem to have to go this far fortunately.)
- * 
+ *
  * @return  VINF_SUCCESS if found, VERR_FILE_NOT_FOUND otherwise.
  * @param   Entry       The current I/O registry entry reference.
  * @param   pszName     Where to store the name. 128 bytes.
- * @param   cRecursions Number of recursions. This is used as an precation 
+ * @param   cRecursions Number of recursions. This is used as an precation
  *                      just to limit the depth and avoid blowing the stack
  *                      should we hit a bug or something.
@@ -610 +610 @@
 
 
-/** 
+/**
  * Callback notifying us that the async DADiskClaim()/DADiskUnmount call has completed.
- * 
+ *
  * @param   DiskRef         The disk that was attempted claimed / unmounted.
  * @param   DissenterRef    NULL on success, contains details on failure.
@@ -630 +630 @@
 /**
  * Obtain exclusive access to the DVD device, umount it if necessary.
- * 
+ *
  * @return  VBox status code.
  * @param   pThis       The driver instance.
@@ -644 +644 @@
         if (irc == kIOReturnSuccess)
         {
-            /* 
+            /*
              * This is a bit weird, but if we unmounted the DVD drive we also need to
              * unlock it afterwards or the guest won't be able to eject it later on.
@@ -661 +661 @@
         if (irc == kIOReturnExclusiveAccess)
             return VERR_SHARING_VIOLATION;      /* already used exclusivly. */
-        if (irc != kIOReturnBusy) 
+        if (irc != kIOReturnBusy)
             return VERR_GENERAL_FAILURE;        /* not mounted */
 
         /*
          * Attempt to the unmount all volumes of the device.
-         * It seems we can can do this all in one go without having to enumerate the 
-         * volumes (sessions) and deal with them one by one. This is very fortuitous 
+         * It seems we can can do this all in one go without having to enumerate the
+         * volumes (sessions) and deal with them one by one. This is very fortuitous
          * as the disk arbitration API is a bit cumbersome to deal with.
          */
@@ -683 +683 @@
                 if (pThis->pDADisk)
                 {
-                    /* 
+                    /*
                      * Try claim the device.
                      */
@@ -717 +717 @@
                     else
                         Log(("%s-%d: claim => rc32=%d & rcDA=%#x\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance, rc32, rcDA));
-                    
+
                     CFRelease(pThis->pDADisk);
                     pThis->pDADisk = NULL;
@@ -1501 +1501 @@
 
 #ifdef __DARWIN__
-    /* 
-     * The unclaiming doesn't seem to mean much, the DVD is actaully 
+    /*
+     * The unclaiming doesn't seem to mean much, the DVD is actaully
      * remounted when we release exclusive access. I'm not quite sure
      * if I should put the unclaim first or not...
@@ -1563 +1563 @@
     }
 
-    if (RTCritSectIsInitialized(&pThis->CritSect))
+    /* Forget about the notifications. */
+    pThis->pDrvMountNotify = NULL;
+
+    /* Leave the instance operational if this is just a cleanup of the state
+     * after an attach error happened. So don't destry the critsect then. */
+    if (!pThis->fKeepInstance && RTCritSectIsInitialized(&pThis->CritSect))
         RTCritSectDelete(&pThis->CritSect);
     LogFlow(("%s-%d: drvHostBaseDestruct completed\n", pDrvIns->pDrvReg->szDriverName, pDrvIns->iInstance));
@@ -1591 +1596 @@
      */
     pThis->pDrvIns                          = pDrvIns;
+    pThis->fKeepInstance                    = false;
     pThis->ThreadPoller                     = NIL_RTTHREAD;
 #ifdef __DARWIN__
@@ -1722 +1728 @@
     }
 
+    /* Define whether attach failure is an error (default) or not. */
+    bool fAttachFailError;
+    rc = CFGMR3QueryBool(pCfgHandle, "AttachFailError", &fAttachFailError);
+    if (VBOX_FAILURE(rc))
+        fAttachFailError = true;
+    pThis->fAttachFailError = fAttachFailError;
+
     /* name to open & watch for */
 #ifdef __WIN__
@@ -1754 +1767 @@
 int DRVHostBaseInitFinish(PDRVHOSTBASE pThis)
 {
+    int src = VINF_SUCCESS;
     PPDMDRVINS pDrvIns = pThis->pDrvIns;
 
@@ -1851 +1865 @@
                        pszDevice);
             default:
-                return rc;
+                if (pThis->fAttachFailError)
+                    return rc;
+                else
+                {
+                    int erc = PDMDrvHlpVMSetRuntimeError(pDrvIns,
+                                                         false, "DrvHost_MOUNTFAIL",
+                                                         N_("Cannot attach to host device '%s'"), pszDevice);
+                    AssertRC(erc);
+                    src = rc;
+                }
         }
     }
 #ifdef __WIN__
-    DRVHostBaseMediaPresent(pThis);
+    if (VBOX_SUCCESS(src))
+        DRVHostBaseMediaPresent(pThis);
 #endif
 
@@ -1873 +1897 @@
 
 #ifndef __WIN__
-    /*
-     * Create the event semaphore which the poller thread will wait on.
-     */
-    rc = RTSemEventCreate(&pThis->EventPoller);
-    if (VBOX_FAILURE(rc))
-        return rc;
+    if (VBOX_SUCCESS(src))
+    {
+        /*
+         * Create the event semaphore which the poller thread will wait on.
+         */
+        rc = RTSemEventCreate(&pThis->EventPoller);
+        if (VBOX_FAILURE(rc))
+            return rc;
+    }
 #endif
 
@@ -1888 +1915 @@
         return rc;
 
-    /*
-     * Start the thread which will poll for the media.
-     */
-    rc = RTThreadCreate(&pThis->ThreadPoller, drvHostBaseMediaThread, pThis, 0,
-                        RTTHREADTYPE_INFREQUENT_POLLER, RTTHREADFLAGS_WAITABLE, "DVDMEDIA");
-    if (VBOX_FAILURE(rc))
-    {
-        AssertMsgFailed(("Failed to create poller thread. rc=%Vrc\n", rc));
+    if (VBOX_SUCCESS(src))
+    {
+        /*
+         * Start the thread which will poll for the media.
+         */
+        rc = RTThreadCreate(&pThis->ThreadPoller, drvHostBaseMediaThread, pThis, 0,
+                            RTTHREADTYPE_INFREQUENT_POLLER, RTTHREADFLAGS_WAITABLE, "DVDMEDIA");
+        if (VBOX_FAILURE(rc))
+        {
+            AssertMsgFailed(("Failed to create poller thread. rc=%Vrc\n", rc));
+            return rc;
+        }
+
+        /*
+         * Wait for the thread to start up (!w32:) and do one detection loop.
+         */
+        rc = RTThreadUserWait(pThis->ThreadPoller, 10000);
+        AssertRC(rc);
+#ifdef __WIN__
+        if (!pThis->hwndDeviceChange)
+            return VERR_GENERAL_FAILURE;
+#endif
+    }
+
+    if (VBOX_FAILURE(src))
+        return src;
+    else
         return rc;
-    }
-
-    /*
-     * Wait for the thread to start up (!w32:) and do one detection loop.
-     */
-    rc = RTThreadUserWait(pThis->ThreadPoller, 10000);
-    AssertRC(rc);
-#ifdef __WIN__
-    if (!pThis->hwndDeviceChange)
-        return VERR_GENERAL_FAILURE;
-#endif
-
-    return rc;
-}
-
+}
+