Changeset 44232 in vbox for trunk/src/VBox/Storage/VMDK.cpp

Timestamp:

Jan 4, 2013 2:30:20 PM (12 years ago)

Author:

vboxsync

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

83070

Message:

Storage: Fix regression introduced when adding VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS resulting in non working online merging of snapshots

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (1 diff)

trunk/src/VBox/Storage/VMDK.cpp

@@ -6536 +6536 @@
 
     /* Image must be opened and the new flags must be valid. */
-    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL)))
+    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
+                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE
+                                   | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
     {
         rc = VERR_INVALID_PARAMETER;