Changeset 56967 in vbox for trunk/src/VBox

Timestamp:

Jul 17, 2015 1:07:09 PM (9 years ago)

Author:

vboxsync

Message:

Devices/Storage: Keep track of used host block devices and prevent the host from opening any device while it is still in use by VBox on OS X

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Storage/DrvVD.cpp (modified) (5 diffs)
• Storage/HBDMgmt-darwin.cpp (added)
• Storage/HBDMgmt-generic.cpp (added)
• Storage/HBDMgmt.h (added)

trunk/src/VBox/Devices/Makefile.kmk

@@ -195 +195 @@
  endif
 
+ ifn1of ($(KBUILD_TARGET), darwin)
+  VBoxDD_SOURCES += Storage/HBDMgmt-generic.cpp
+ endif
+
+ VBoxDD_SOURCES.darwin += Storage/HBDMgmt-darwin.cpp
+
  VBoxDD_LIBS             = # more later.
  VBoxDD_LDFLAGS.darwin   = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDD.dylib \

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

@@ -52 +52 @@
 #endif /* VBOX_WITH_INIP */
 
+#include "HBDMgmt.h"
+
 #include "VBoxDD.h"
 
@@ -187 +189 @@
     /** The block cache handle if configured. */
     PPDMBLKCACHE             pBlkCache;
+    /** Host block device manager. */
+    HBDMGR                   hHbdMgr;
 
     /** Cryptographic support
@@ -350 +354 @@
 {
     PVBOXDISK pThis = (PVBOXDISK)pvUser;
-    PDRVVDSTORAGEBACKEND pStorageBackend = (PDRVVDSTORAGEBACKEND)RTMemAllocZ(sizeof(DRVVDSTORAGEBACKEND));
+    PDRVVDSTORAGEBACKEND pStorageBackend = NULL;
     int rc = VINF_SUCCESS;
 
+    /*
+     * Check whether the backend wants to open a block device and try to prepare it
+     * if we didn't claim it yet.
+     *
+     * We only create a block device manager on demand to not waste any resources.
+     */
+    if (HBDMgrIsBlockDevice(pszLocation))
+    {
+        if (pThis->hHbdMgr == NIL_HBDMGR)
+            rc = HBDMgrCreate(&pThis->hHbdMgr);
+
+        if (   RT_SUCCESS(rc)
+            && !HBDMgrIsBlockDeviceClaimed(pThis->hHbdMgr, pszLocation))
+            rc = HBDMgrClaimBlockDevice(pThis->hHbdMgr, pszLocation);
+
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+
+    pStorageBackend = (PDRVVDSTORAGEBACKEND)RTMemAllocZ(sizeof(DRVVDSTORAGEBACKEND));
     if (pStorageBackend)
     {
@@ -415 +439 @@
     PDRVVDSTORAGEBACKEND pStorageBackend = (PDRVVDSTORAGEBACKEND)pStorage;
 
+    /*
+     * We don't unclaim any block devices on purpose here because they
+     * might get reopened shortly (switching to readonly during suspend)
+     *
+     * Block devices will get unclaimed during destruction of the driver.
+     */
+
     PDMR3AsyncCompletionEpClose(pStorageBackend->pEndpoint);
     PDMR3AsyncCompletionTemplateDestroy(pStorageBackend->pTemplate);
     RTSemEventDestroy(pStorageBackend->EventSem);
     RTMemFree(pStorageBackend);
-
     return VINF_SUCCESS;;
 }
@@ -2504 +2534 @@
         pThis->pszBwGroup = NULL;
     }
+    if (pThis->hHbdMgr != NIL_HBDMGR)
+        HBDMgrDestroy(pThis->hHbdMgr);
 }