Changeset 31184 in vbox

Timestamp:

Jul 28, 2010 8:23:47 PM (14 years ago)

Author:

vboxsync

Message:

Fix assertion in drvvdSetReadonly

Location:

trunk/src/VBox/Devices/Storage

Files:

• ParallelsHDDCore.cpp (modified) (1 diff)
• VDIHDDCore.cpp (modified) (2 diffs)
• VHDHDDCore.cpp (modified) (1 diff)
• VmdkHDDCore.cpp (modified) (3 diffs)

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

@@ -882 +882 @@
     /* 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)))
+    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SHAREABLE)))
     {
         rc = VERR_INVALID_PARAMETER;

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

@@ -883 +883 @@
                                        &pImage->Header.u.v0, sizeof(pImage->Header.u.v0),
                                        pIoCtx);
+
             break;
         case 1:
@@ -1667 +1668 @@
     /* 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)))
+    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE)))
     {
         rc = VERR_INVALID_PARAMETER;

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

@@ -1089 +1089 @@
     /* 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)))
+    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SHAREABLE)))
     {
         rc = VERR_INVALID_PARAMETER;

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

@@ -2669 +2669 @@
     RTMemFree(pszDescriptor);
     return rc;
+
 }
 
@@ -5661 +5662 @@
         goto out;
     }
+
 
     /* Clip read range to remain in this extent. */
@@ -6145 +6147 @@
     /* 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)))
+    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE)))
     {
         rc = VERR_INVALID_PARAMETER;