Changeset 51163 in vbox

Timestamp:

Apr 29, 2014 12:47:21 PM (11 years ago)

Author:

vboxsync

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

93512

Message:

Mac OS X host: Host USB: improve checking if storage device is currently mounted.

File:

• trunk/src/VBox/Main/src-server/darwin/iokit.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/darwin/iokit.cpp

@@ -39 +39 @@
 # include <IOKit/usb/IOUSBLib.h>
 # include <IOKit/IOCFPlugIn.h>
+# include <IOKit/storage/IOMedia.h>
 #endif
 
@@ -737 +738 @@
 static bool darwinIsMassStorageInterfaceInUse(io_object_t MSDObj, io_name_t pszNameBuf)
 {
-    io_object_t MediaObj = darwinFindObjectByClass(MSDObj, "IOMedia", pszNameBuf);
+    io_object_t MediaObj = darwinFindObjectByClass(MSDObj, kIOMediaClass, pszNameBuf);
     if (MediaObj)
     {
+        CFMutableDictionaryRef pProperties;
+        kern_return_t krc;
+        bool fInUse = true;
+
+        krc = IORegistryEntryCreateCFProperties(MediaObj, &pProperties, kCFAllocatorDefault, kNilOptions);
+        if (krc == KERN_SUCCESS)
+        {
+            CFBooleanRef pBoolValue = (CFBooleanRef)CFDictionaryGetValue(pProperties, CFSTR(kIOMediaOpenKey));
+            if (pBoolValue)
+                fInUse = CFBooleanGetValue(pBoolValue);
+
+            CFRelease(pProperties);
+        }
+
         /* more checks? */
         IOObjectRelease(MediaObj);
-        return true;
-    }
+        return fInUse;
+    }
+
     return false;
 }