Changeset 86241 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 23, 2020 2:31:55 PM (4 years ago)

Author:

vboxsync

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

140510

Message:

Main: bugref:9224: Fixed the error when obtain the disk info in block mode in the MacOS

File:

• trunk/src/VBox/Main/src-server/HostDriveImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/HostDriveImpl.cpp

@@ -66 +66 @@
     m.partitions.clear();
 
-    const char *pszDrivePath = drivePath.c_str();
-
-#ifdef RT_OS_DARWIN
-    /*
-     * Ensure the path specified for the drive in raw mode, i.e. drive name begins with 'r'
-     * Otherwise, the RTFileOpen will always return the error about 'busy resource'
-     */
-    /** @todo r=bird: Shouldn't we make iokit.cpp just return the /dev/rdiskX*
-     *        paths instead then? */
-    com::Utf8Str strAdjustedDrivePath;
-    const char *pszDriveName = RTPathFilename(pszDrivePath);
-    if (pszDriveName && *pszDriveName != 'r')
-    {
-        strAdjustedDrivePath = drivePath.substr(0, (size_t)(pszDriveName - pszDrivePath));
-        strAdjustedDrivePath.append('r');
-        strAdjustedDrivePath.append(pszDriveName);
-        pszDrivePath = strAdjustedDrivePath.c_str();
-    }
-#endif
-
     /*
      * Try open the drive so we can extract futher details,
@@ -92 +72 @@
     HRESULT hrc = E_FAIL;
     RTFILE hRawFile = NIL_RTFILE;
-    int vrc = RTFileOpen(&hRawFile, pszDrivePath, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
+    int vrc = RTFileOpen(&hRawFile, drivePath.c_str(), RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
     if (RT_SUCCESS(vrc))
     {
@@ -192 +172 @@
     }
     else
-        hrc = Global::vboxStatusCodeToCOM(vrc);
+    {
+        /*
+         * We don't use the Global::vboxStatusCodeToCOM(vrc) here
+         * because RTFileOpen can return some error which causes
+         * the assertion and breaks original idea of returning
+         * the object in the limited state.
+         */
+        if (   vrc == VERR_RESOURCE_BUSY
+            || vrc == VERR_ACCESS_DENIED)
+            hrc = E_ACCESSDENIED;
+        else
+            hrc = VBOX_E_IPRT_ERROR;
+    }
 
     /* Confirm a successful initialization */