Changeset 58484 in vbox

Timestamp:

Oct 29, 2015 1:48:32 PM (9 years ago)

Author:

vboxsync

Message:

Main/Machine+Medium: for diff images keep the variant of the parent if possible (helpful with VMs on FAT32 disks when using snapshots)

Location:

trunk/src/VBox/Main

Files:

• include/MediumImpl.h (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (2 diffs)
• src-server/MachineImplCloneVM.cpp (modified) (1 diff)
• src-server/MediumImpl.cpp (modified) (1 diff)

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

@@ -169 +169 @@
                                 bool aWait);
     Utf8Str i_getPreferredDiffFormat();
+    MediumVariant_T i_getPreferredDiffVariant();
 
     HRESULT i_close(AutoCaller &autoCaller);

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

@@ -4192 +4192 @@
 
                 rc = medium->i_createDiffStorage(diff,
-                                                 MediumVariant_Standard,
+                                                 medium->i_getPreferredDiffVariant(),
                                                  pMediumLockList,
                                                  NULL /* aProgress */,
@@ -10823 +10823 @@
             /* release the locks before the potentially lengthy operation */
             alock.release();
-            rc = pMedium->i_createDiffStorage(diff, MediumVariant_Standard,
+            rc = pMedium->i_createDiffStorage(diff,
+                                              pMedium->i_getPreferredDiffVariant(),
                                               pMediumLockList,
                                               NULL /* aProgress */,

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

@@ -725 +725 @@
 
         /* this already registers the new diff image */
-        rc = pParent->i_createDiffStorage(diff, MediumVariant_Standard,
+        rc = pParent->i_createDiffStorage(diff,
+                                          pParent->i_getPreferredDiffVariant(),
                                           pMediumLockList,
                                           NULL /* aProgress */,

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

@@ -4510 +4510 @@
     /* m->strFormat is const, no need to lock */
     return m->strFormat;
+}
+
+/**
+ * Returns a preferred variant for differencing media.
+ */
+MediumVariant_T Medium::i_getPreferredDiffVariant()
+{
+    AutoCaller autoCaller(this);
+    AssertComRCReturn(autoCaller.rc(), MediumVariant_Standard);
+
+    /* check that our own format supports diffs */
+    if (!(m->formatObj->i_getCapabilities() & MediumFormatCapabilities_Differencing))
+        return MediumVariant_Standard;
+
+    /* m->variant is const, no need to lock */
+    return m->variant;
 }