VirtualBox

Changeset 44232 in vbox for trunk/src/VBox/Storage


Ignore:
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

Location:
trunk/src/VBox/Storage
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Storage/DMG.cpp

    r41783 r44232  
    19971997
    19981998    /* Image must be opened and the new flags must be valid. */
    1999     if (!pThis || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL)))
     1999    if (!pThis || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     2000                                  | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL
     2001                                  | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    20002002    {
    20012003        rc = VERR_INVALID_PARAMETER;

  • trunk/src/VBox/Storage/ISCSI.cpp

    r43925 r44232  
    50245024
    50255025    /* Image must be opened and the new flags must be valid. */
    5026     if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL)))
     5026    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     5027                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE
     5028                                   | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    50275029    {
    50285030        rc = VERR_INVALID_PARAMETER;

  • trunk/src/VBox/Storage/Parallels.cpp

    r44101 r44232  
    966966
    967967    /* Image must be opened and the new flags must be valid. */
    968     if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_ASYNC_IO)))
     968    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     969                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE
     970                                   | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    969971    {
    970972        rc = VERR_INVALID_PARAMETER;

  • trunk/src/VBox/Storage/QCOW.cpp

    r40106 r44232  
    21952195
    21962196    /* Image must be opened and the new flags must be valid. */
    2197     if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO)))
     2197    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     2198                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    21982199    {
    21992200        rc = VERR_INVALID_PARAMETER;

  • trunk/src/VBox/Storage/QED.cpp

    r40843 r44232  
    22092209
    22102210    /* Image must be opened and the new flags must be valid. */
    2211     if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO)))
     2211    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     2212                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    22122213    {
    22132214        rc = VERR_INVALID_PARAMETER;

  • trunk/src/VBox/Storage/RAW.cpp

    r40399 r44232  
    906906
    907907    /* Image must be opened and the new flags must be valid. */
    908     if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL)))
     908    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     909                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE
     910                                   | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    909911    {
    910912        rc = VERR_INVALID_PARAMETER;

  • trunk/src/VBox/Storage/VD.cpp

    r44226 r44232  
    66536653        if (uOpenFlags & VD_OPEN_FLAGS_READONLY)
    66546654        {
    6655             uOpenFlags &= ~VD_OPEN_FLAGS_READONLY;
     6655            /*
     6656             * Clear skip consistency checks because the image is made writable now and
     6657             * skipping consistency checks is only possible for readonly images.
     6658             */
     6659            uOpenFlags &= ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS);
    66566660            rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pBackendData,
    66576661                                                    uOpenFlags);

  • trunk/src/VBox/Storage/VDI.cpp

    r44225 r44232  
    20542054
    20552055    /* Image must be opened and the new flags must be valid. */
    2056     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_DISCARD)))
     2056    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     2057                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE
     2058                                   | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_DISCARD
     2059                                   | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    20572060    {
    20582061        rc = VERR_INVALID_PARAMETER;

  • trunk/src/VBox/Storage/VHD.cpp

    r44229 r44232  
    19231923
    19241924    /* Image must be opened and the new flags must be valid. */
    1925     if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL)))
     1925    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     1926                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE
     1927                                   | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    19261928    {
    19271929        rc = VERR_INVALID_PARAMETER;

  • trunk/src/VBox/Storage/VHDX.cpp

    r41447 r44232  
    21622162
    21632163    /* Image must be opened and the new flags must be valid. */
    2164     if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO)))
     2164    if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    21652165        rc = VERR_INVALID_PARAMETER;
    21662166    else

  • trunk/src/VBox/Storage/VMDK.cpp

    r43861 r44232  
    65366536
    65376537    /* Image must be opened and the new flags must be valid. */
    6538     if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL)))
     6538    if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
     6539                                   | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE
     6540                                   | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS)))
    65396541    {
    65406542        rc = VERR_INVALID_PARAMETER;
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette