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

Timestamp:

Dec 11, 2018 9:01:30 AM (6 years ago)

Author:

vboxsync

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

127399

Message:

Main: bugref:9324: Added new error for "medium shrink is not allowed"

Location:

trunk/src/VBox/Storage

Files:

• VDI.cpp (modified) (1 diff)
• VHD.cpp (modified) (1 diff)

trunk/src/VBox/Storage/VDI.cpp

@@ -2527 +2527 @@
     /** @todo implement making the image smaller, it is the responsibility of
      * the user to know what he's doing. */
-    if (   cbSize < getImageDiskSize(&pImage->Header)
-        || GET_MAJOR_HEADER_VERSION(&pImage->Header) == 0
-        || pImage->uImageFlags & VD_IMAGE_FLAGS_FIXED)
+    if (cbSize < getImageDiskSize(&pImage->Header))
+        rc = VERR_VD_SHRINK_NOT_SUPPORTED;
+    else if (   GET_MAJOR_HEADER_VERSION(&pImage->Header) == 0
+             || pImage->uImageFlags & VD_IMAGE_FLAGS_FIXED)
         rc = VERR_NOT_SUPPORTED;
     else if (cbSize > getImageDiskSize(&pImage->Header))

trunk/src/VBox/Storage/VHD.cpp

@@ -2546 +2546 @@
 
     /* Making the image smaller is not supported at the moment. */
-    if (   cbSize < pImage->cbSize
-        || pImage->uImageFlags & VD_IMAGE_FLAGS_FIXED)
+    if (cbSize < pImage->cbSize)
+        rc = VERR_VD_SHRINK_NOT_SUPPORTED;
+    else if (pImage->uImageFlags & VD_IMAGE_FLAGS_FIXED)
         rc = VERR_NOT_SUPPORTED;
     else if (cbSize > pImage->cbSize)