Changeset 18813 in vbox for trunk/src/VBox

Timestamp:

Apr 7, 2009 12:28:57 PM (16 years ago)

Author:

vboxsync

Message:

Main/IMedium,IHardDisk: fix error handling so that VBOX_E_FILE_ERROR is returned when the image is not present.

Location:

trunk/src/VBox/Main

Files:

• HardDiskImpl.cpp (modified) (1 diff)
• MediumImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -2854 +2854 @@
 
             if (RT_FAILURE (vrc))
-                return setError (VBOX_E_IPRT_ERROR,
-                    tr ("Could not get the storage format of the hard disk "
-                        "'%s' (%Rrc)"), locationFull.raw(), vrc);
+            {
+                if (vrc == VERR_FILE_NOT_FOUND || vrc == VERR_PATH_NOT_FOUND)
+                    return setError (VBOX_E_FILE_ERROR,
+                        tr ("Could not find file for the hard disk "
+                            "'%s' (%Rrc)"), locationFull.raw(), vrc);
+                else
+                    return setError (VBOX_E_IPRT_ERROR,
+                        tr ("Could not get the storage format of the hard disk "
+                            "'%s' (%Rrc)"), locationFull.raw(), vrc);
+            }
 
             ComAssertRet (backendName != NULL && *backendName != '\0', E_FAIL);

trunk/src/VBox/Main/MediumImpl.cpp

@@ -969 +969 @@
          * newly opened media so convert this into an error */
         if (!m.lastAccessError.isNull())
-            rc = setError (E_FAIL, Utf8Str (m.lastAccessError));
+            rc = setError (VBOX_E_FILE_ERROR, Utf8Str (m.lastAccessError));
     }