Changeset 67885 in vbox

Timestamp:

Jul 10, 2017 4:45:06 PM (8 years ago)

Author:

vboxsync

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

116851

Message:

Main/Snapshot: detect if snapshot merging would lose data due to capacity differences, and error out if necessary

Location:

trunk/src/VBox/Main

Files:

• include/MediumImpl.h (modified) (1 diff)
• src-server/MediumImpl.cpp (modified) (1 diff)
• src-server/SnapshotImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/MediumImpl.h

@@ -109 +109 @@
     bool i_isMediumFormatFile() const;
     uint64_t i_getSize() const;
+    uint64_t i_getLogicalSize() const;
     DeviceType_T i_getDeviceType() const;
     MediumType_T i_getType() const;

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

@@ -3811 +3811 @@
 {
     return m->size;
+}
+
+/**
+ * Internal method to return the medium's size. Must have caller + locking!
+ * @return
+ */
+uint64_t Medium::i_getLogicalSize() const
+{
+    return m->logicalSize;
 }
 

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

@@ -2805 +2805 @@
             // base image. Important e.g. for medium formats which do not have
             // a file representation such as iSCSI.
+
+            // not going to merge a big source into a small target
+            if (pSource->i_getLogicalSize() > pTarget->i_getLogicalSize())
+            {
+                rc = setError(E_FAIL,
+                              tr("Unable to merge storage '%s', because it is smaller than the source image. If you resize it to have a capacity of at least %lld bytes you can retry"),
+                              pTarget->i_getLocationFull().c_str(), pSource->i_getLogicalSize());
+                throw rc;
+            }
 
             // a couple paranoia checks for backward merges