Changeset 55977 in vbox for trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

Timestamp:

May 20, 2015 4:52:25 PM (10 years ago)

Author:

vboxsync

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

100486

Message:

Main/Snapshot: add a parameter to IMachine.takeSnapshot, returning the snapshot UUID, which is useful for finding the snapshot reliably (using the non-unique name is error prone), plus the necessary code adaptions everywhere.
Frontends/VBoxManage: add a feature for creating unique snapshot names (by appending a number or timestamp).

File:

• trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (modified) (13 diffs)

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

@@ -1332 +1332 @@
                      const Utf8Str &strName,
                      const Utf8Str &strDescription,
+                     const Guid &uuidSnapshot,
                      bool fPause,
                      uint32_t uMemSize,
@@ -1338 +1339 @@
           m_strName(strName),
           m_strDescription(strDescription),
+          m_uuidSnapshot(uuidSnapshot),
           m_fPause(fPause),
           m_uMemSize(uMemSize),
@@ -1357 +1359 @@
     Utf8Str m_strName;
     Utf8Str m_strDescription;
+    Guid m_uuidSnapshot;
     Utf8Str m_strStateFilePath;
     ComPtr<IInternalSessionControl> m_pDirectControl;
@@ -1412 +1415 @@
                               const com::Utf8Str &aDescription,
                               BOOL fPause,
+                              com::Guid &aId,
                               ComPtr<IProgress> &aProgress)
 {
@@ -1417 +1421 @@
     NOREF(aDescription);
     NOREF(fPause);
+    NOREF(aId);
     NOREF(aProgress);
     ReturnComNotImplemented();
@@ -1424 +1429 @@
                                      const com::Utf8Str &aDescription,
                                      BOOL fPause,
+                                     com::Guid &aId,
                                      ComPtr<IProgress> &aProgress)
 {
@@ -1482 +1488 @@
         return rc;
 
+    /* create an ID for the snapshot */
+    Guid snapshotId;
+    snapshotId.create();
+
     /* create and start the task on a separate thread (note that it will not
      * start working until we release alock) */
@@ -1490 +1500 @@
                                                    aName,
                                                    aDescription,
+                                                   snapshotId,
                                                    !!fPause,
                                                    mHWData->mMemorySize,
@@ -1509 +1520 @@
         i_setMachineState(MachineState_Snapshotting);
 
+    aId = snapshotId;
     pTask->m_pProgress.queryInterfaceTo(aProgress.asOutParam());
 
@@ -1555 +1567 @@
     bool fBeganTakingSnapshot = false;
     BOOL fSuspendedBySave     = FALSE;
-    Guid snapshotId;
 
     try
@@ -1606 +1617 @@
         /* STEP 1: create the snapshot object */
 
-        /* create an ID for the snapshot */
-        snapshotId.create();
-
         /* create a snapshot machine object */
         ComObjPtr<SnapshotMachine> pSnapshotMachine;
         pSnapshotMachine.createObject();
-        rc = pSnapshotMachine->init(this, snapshotId.ref(), task.m_strStateFilePath);
+        rc = pSnapshotMachine->init(this, task.m_uuidSnapshot.ref(), task.m_strStateFilePath);
         AssertComRCThrowRC(rc);
 
@@ -1620 +1628 @@
         task.m_pSnapshot.createObject();
         rc = task.m_pSnapshot->init(mParent,
-                                    snapshotId,
+                                    task.m_uuidSnapshot,
                                     task.m_strName,
                                     task.m_strDescription,
@@ -1797 +1805 @@
 
     if (SUCCEEDED(rc))
-        mParent->i_onSnapshotTaken(mData->mUuid, snapshotId);
+        mParent->i_onSnapshotTaken(mData->mUuid, task.m_uuidSnapshot);
     LogFlowThisFuncLeave();
 }