Changeset 38141 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 25, 2011 10:27:35 AM (14 years ago)

Author:

vboxsync

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

73096

Message:

Main-CloneVM: fix the recursive snapshot searching

File:

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

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

@@ -108 +108 @@
 
     /* MachineCloneVM::run helper: */
-    settings::Snapshot findSnapshot(settings::MachineConfigFile *pMCF, const settings::SnapshotsList &snl, const Guid &id) const;
+    bool findSnapshot(const settings::SnapshotsList &snl, const Guid &id, settings::Snapshot &sn) const;
     void updateMACAddresses(settings::NetworkAdaptersList &nwl) const;
     void updateMACAddresses(settings::SnapshotsList &sl) const;
@@ -530 +530 @@
 }
 
-settings::Snapshot MachineCloneVMPrivate::findSnapshot(settings::MachineConfigFile *pMCF, const settings::SnapshotsList &snl, const Guid &id) const
+bool MachineCloneVMPrivate::findSnapshot(const settings::SnapshotsList &snl, const Guid &id, settings::Snapshot &sn) const
 {
     settings::SnapshotsList::const_iterator it;
@@ -536 +536 @@
     {
         if (it->uuid == id)
-            return *it;
+        {
+            sn = (*it);
+            return true;
+        }
         else if (!it->llChildSnapshots.empty())
-            return findSnapshot(pMCF, it->llChildSnapshots, id);
-    }
-    return settings::Snapshot();
+        {
+            if (findSnapshot(it->llChildSnapshots, id, sn))
+                return true;
+        }
+    }
+    return false;
 }
 
@@ -922 +928 @@
         settings::Snapshot sn;
         if (!d->snapshotId.isEmpty())
-            sn = d->findSnapshot(&trgMCF, trgMCF.llFirstSnapshot, d->snapshotId);
+            d->findSnapshot(trgMCF.llFirstSnapshot, d->snapshotId, sn);
 
         if (d->mode == CloneMode_MachineState)