Changeset 59049 in vbox

Timestamp:

Dec 8, 2015 10:50:26 AM (9 years ago)

Author:

vboxsync

Message:

HBDMgmt-darwin.cpp: Log more details about the error if available

File:

• trunk/src/VBox/Devices/Storage/HBDMgmt-darwin.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/HBDMgmt-darwin.cpp

@@ -95 +95 @@
     /** The status code returned by the callback, after the operation completed. */
     DAReturn           rcDA;
+    /** A detailed error string in case of an error, can be NULL.
+     * Must be freed with RTStrFree(). */
+    char              *pszErrDetail;
 } HBDMGRDACLBKARGS;
 typedef HBDMGRDACLBKARGS *PHBDMGRDACLBKARGS;
@@ -207 +210 @@
 {
     PHBDMGRDACLBKARGS pArgs = (PHBDMGRDACLBKARGS)pvContext;
+    pArgs->pszErrDetail = NULL;
+
     if (!hDissenterRef)
         pArgs->rcDA = kDAReturnSuccess;
     else
+    {
+        CFStringRef hStrErr = DADissenterGetStatusString(hDissenterRef);
+        if (hStrErr)
+        {
+            const char *pszErrDetail = CFStringGetCStringPtr(hStrErr, kCFStringEncodingUTF8);
+            if (pszErrDetail)
+                pArgs->pszErrDetail = RTStrDup(pszErrDetail);
+            CFRelease(hStrErr);
+        }
         pArgs->rcDA = DADissenterGetStatus(hDissenterRef);
+
+    }
     RTSemEventSignal(pArgs->pThis->hEvtCallback);
 }
@@ -453 +469 @@
                 {
                     rc = hbdMgrDAReturn2VBoxStatus(CalllbackArgs.rcDA);
-                    LogRel(("HBDMgrClaimBlockDevice: DADiskUnmount(\"%s\") failed with %Rrc\n",
-                            pszFilename, rc));
+                    LogRel(("HBDMgrClaimBlockDevice: DADiskUnmount(\"%s\") failed with %Rrc (%s)\n",
+                            pszFilename, rc, CalllbackArgs.pszErrDetail ? CalllbackArgs.pszErrDetail : "<no detail>"));
+                    if (CalllbackArgs.pszErrDetail)
+                        RTStrFree(CalllbackArgs.pszErrDetail);
                 }
             }
@@ -460 +478 @@
             {
                 rc = hbdMgrDAReturn2VBoxStatus(CalllbackArgs.rcDA);
-                LogRel(("HBDMgrClaimBlockDevice: DADiskClaim(\"%s\") failed with %Rrc\n",
-                        pszFilename, rc));
+                LogRel(("HBDMgrClaimBlockDevice: DADiskClaim(\"%s\") failed with %Rrc (%s)\n",
+                        pszFilename, rc, CalllbackArgs.pszErrDetail ? CalllbackArgs.pszErrDetail : "<no detail>"));
+                if (CalllbackArgs.pszErrDetail)
+                    RTStrFree(CalllbackArgs.pszErrDetail);
             }
             if (RT_FAILURE(rc))