Changeset 13580 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 27, 2008 2:04:18 PM (16 years ago)

Author:

vboxsync

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

38479

Message:

Ported s2 branch (r37120:38456).

Location:

trunk/src/VBox/Devices/Storage

Files:

• RawHDDCore.cpp (modified) (1 diff)
• VBoxHDD-new.cpp (modified) (1 diff)
• VDIHDDCore.cpp (modified) (1 diff)
• VHDHDDCore.cpp (modified) (1 diff)
• VmdkHDDCore.cpp (modified) (1 diff)

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

@@ -777 +777 @@
     int rc;
 
-    /* Image must be opened and the new flags must be valid. Just readonly flag
-     * is supported. */
-    if (!pImage || uOpenFlags & ~VD_OPEN_FLAGS_READONLY)
+    /* Image must be opened and the new flags must be valid. Just readonly and
+     * info flags are supported. */
+    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO)))
     {
         rc = VERR_INVALID_PARAMETER;

trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

@@ -973 +973 @@
         rc = RTDirOpenFiltered(&pPluginDir, pszPluginFilter, RTDIRFILTER_WINNT);
         if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_FILE_NOT_FOUND)
+            {
+                /* VERR_FILE_NOT_FOUND would be interpreted as the hard
+                 * disk storage unit was not found, so replace with
+                 * VERR_NOT_SUPPORTED which is more meaningful in this case */
+                rc = VERR_NOT_SUPPORTED;
+            }
             break;
+        }
 
         PRTDIRENTRYEX pPluginDirEntry = NULL;

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

@@ -1420 +1420 @@
 static int vdiSetOpenFlags(void *pBackendData, unsigned uOpenFlags)
 {
-    LogFlowFunc(("pBackendData=%#p\n uOpenFlags=%#x", pBackendData, uOpenFlags));
+    LogFlowFunc(("pBackendData=%#p uOpenFlags=%#x\n", pBackendData, uOpenFlags));
     PVDIIMAGEDESC pImage = (PVDIIMAGEDESC)pBackendData;
     int rc;
     const char *pszFilename;
 
-    /* Image must be opened and the new flags must be valid. Just readonly flag
-     * is supported. */
-    if (!pImage || uOpenFlags & ~VD_OPEN_FLAGS_READONLY)
+    /* Image must be opened and the new flags must be valid. Just readonly and
+     * info flags are supported. */
+    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO)))
     {
         rc = VERR_INVALID_PARAMETER;

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

@@ -775 +775 @@
     int rc;
 
-    /* Image must be opened and the new flags must be valid. Just readonly flag
-     * is supported. */
-    if (!pImage || uOpenFlags & ~VD_OPEN_FLAGS_READONLY)
+    /* Image must be opened and the new flags must be valid. Just readonly and
+     * info flags are supported. */
+    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO)))
     {
         rc = VERR_INVALID_PARAMETER;

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

@@ -4666 +4666 @@
     int rc;
 
-    /* Image must be opened and the new flags must be valid. Just readonly flag
-     * is supported. */
-    if (!pImage || uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_ASYNC_IO))
+    /* Image must be opened and the new flags must be valid. Just readonly and
+     * info flags are supported. */
+    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO)))
     {
         rc = VERR_INVALID_PARAMETER;