Changeset 76154 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)
• src/VBox/Main/src-server/MediumImpl.cpp (modified) (1 diff)
• src/VBox/Storage/VDI.cpp (modified) (1 diff)
• src/VBox/Storage/VHD.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1677 +1677 @@
 /** The size of the raw floppy image is too big (>2.88MB) */
 #define VERR_VD_RAW_SIZE_FLOPPY_TOO_BIG             (-3289)
-
+/** Reducing the size is not supported */
+#define VERR_VD_SHRINK_NOT_SUPPORTED                (-3290)
 /** @} */
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -765 +765 @@
         if (FAILED(rc))
         {
-            if (rc == E_NOTIMPL)
+            if (!pProgress.isNull())
+                CHECK_PROGRESS_ERROR(pProgress, ("Failed to resize medium"));
+            else if (rc == E_NOTIMPL)
                 RTMsgError("Resize medium operation is not implemented!");
             else if (rc == VBOX_E_NOT_SUPPORTED)
                 RTMsgError("Resize medium operation for this format is not implemented yet!");
-            else if (!pProgress.isNull())
-                CHECK_PROGRESS_ERROR(pProgress, ("Failed to resize medium"));
             else
                 RTMsgError("Failed to resize medium!");

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -10012 +10012 @@
             if (RT_FAILURE(vrc))
             {
+                if (vrc == VERR_VD_SHRINK_NOT_SUPPORTED)
+                    throw setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,
+                                       tr("Shrinking is not yet supported for medium '%s'"),
+                                       location.c_str());
                 if (vrc == VERR_NOT_SUPPORTED)
                     throw setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,

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)