Changeset 38264 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Aug 1, 2011 2:23:57 PM (13 years ago)

Author:

vboxsync

Message:

Main-CloneVM: Respected the modified state of the source VM. Set to unmodified when a new "current state" is created in the "machineandchildren" case.

File:

• trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (modified) (3 diffs)

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

@@ -954 +954 @@
                 /* Current state is under root snapshot. */
                 trgMCF.uuidCurrentSnapshot = sn.uuid;
+                /* There will be created a new differencing image based on this
+                 * snapshot. So reset the modified state. */
+                trgMCF.fCurrentStateModified = false;
             }
             /* The snapshot will be the root one. */
@@ -972 +975 @@
             trgMCF.machineUserData.strSnapshotFolder = "Snapshots";
         trgMCF.strStateFile = "";
-        /* Force writing of setting file. */
-        trgMCF.fCurrentStateModified = true;
         /* Set the new name. */
         const Utf8Str strOldVMName = trgMCF.machineUserData.strName;
@@ -1289 +1290 @@
                                                              &d->pTrgMachine->mData->mUuid);
             if (FAILED(rc)) throw rc;
-        }
-
-        /* Now save the new configuration to disk. */
-        rc = d->pTrgMachine->SaveSettings();
-        if (FAILED(rc)) throw rc;
-        trgLock.release();
+            /* save all VM data */
+            bool fNeedsGlobalSaveSettings = false;
+            rc = d->pTrgMachine->saveSettings(&fNeedsGlobalSaveSettings, Machine::SaveS_Force);
+            if (FAILED(rc)) throw rc;
+            /* Release all locks */
+            trgLock.release();
+            srcLock.release();
+            if (fNeedsGlobalSaveSettings)
+            {
+                /* save the global settings; for that we should hold only the
+                 * VirtualBox lock */
+                AutoWriteLock vlock(p->mParent COMMA_LOCKVAL_SRC_POS);
+                rc = p->mParent->saveSettings();
+                if (FAILED(rc)) throw rc;
+            }
+        }
+
+        /* Any additional machines need saving? */
         if (!llRegistriesThatNeedSaving.empty())
         {
-            srcLock.release();
             rc = p->mParent->saveRegistries(llRegistriesThatNeedSaving);
             if (FAILED(rc)) throw rc;