Changeset 43740 in vbox

Timestamp:

Oct 25, 2012 1:57:24 PM (12 years ago)

Author:

vboxsync

Message:

Main/Snapshot: only check free space on filesystems when the target uses file backing

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (1 diff)

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

@@ -2501 +2501 @@
                 ComObjPtr<Medium> pSource_local = it_md->mpSource;
                 ComObjPtr<Medium> pTarget_local = it_md->mpTarget;
-
-                int vrc = RTFsQuerySerial(pTarget_local->getLocationFull().c_str(), &pu32Serial);
-                if (RT_FAILURE(vrc))
+                ComPtr<IMediumFormat> pTargetFormat;
+
+                rc = pTarget_local->COMGETTER(MediumFormat)(pTargetFormat.asOutParam());
+                if (FAILED(rc))
+                    throw rc;
+                ULONG uTargetCaps = 0;
+                rc = pTargetFormat->COMGETTER(Capabilities)(&uTargetCaps);
+                if (FAILED(rc))
+                    throw rc;
+
+                if (uTargetCaps & MediumFormatCapabilities_File)
                 {
-                    rc = setError(E_FAIL,
-                                      tr(" Impossible merging with '%s'. Can't get storage UID."),
+                    int vrc = RTFsQuerySerial(pTarget_local->getLocationFull().c_str(), &pu32Serial);
+                    if (RT_FAILURE(vrc))
+                    {
+                        rc = setError(E_FAIL,
+                                      tr("Impossible merging with '%s'. Can't get storage UID"),
                                       pTarget_local->getLocationFull().c_str());
-                    throw rc;
+                        throw rc;
+                    }
+
+                    pSource_local->COMGETTER(Size)((LONG64*)&diskSize);
+
+                    /* store needed free space in multimap */
+                    neededStorageFreeSpace.insert(std::make_pair(pu32Serial,diskSize));
+                    /* linking storage UID with snapshot path, it is a helper container (just for easy finding needed path) */
+                    serialMapToStoragePath.insert(std::make_pair(pu32Serial,pTarget_local->getLocationFull().c_str()));
                 }
 
-                pSource_local->COMGETTER(Size)((LONG64*)&diskSize);
-
-                /* store needed free space in multimap */
-                neededStorageFreeSpace.insert(std::make_pair(pu32Serial,diskSize));
-                /* linking storage UID with snapshot path, it is a helper container (just for easy finding needed path) */
-                serialMapToStoragePath.insert(std::make_pair(pu32Serial,pTarget_local->getLocationFull().c_str()));
                 ++it_md;
             }