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

Timestamp:

Aug 14, 2018 4:40:00 PM (7 years ago)

Author:

vboxsync

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

124339

Message:

Main: bugref:8598: added "Keep hardware UUIDs" option to "clone machine" operation.

File:

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

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

@@ -124 +124 @@
                                      ComObjPtr<Medium> *ppDiff) const;
     static DECLCALLBACK(int) copyStateFileProgress(unsigned uPercentage, void *pvUser);
+    static void updateSnapshotHardwareUUIDs(settings::SnapshotsList &snapshot_list, const Guid &id);
 
     /* Private q and parent pointer */
@@ -765 +766 @@
 }
 
+void MachineCloneVMPrivate::updateSnapshotHardwareUUIDs(settings::SnapshotsList &snapshot_list, const Guid &id)
+{
+    for (settings::SnapshotsList::iterator snapshot_it = snapshot_list.begin();
+         snapshot_it != snapshot_list.end();
+         ++snapshot_it)
+    {
+        if (!snapshot_it->hardware.uuid.isValid() || snapshot_it->hardware.uuid.isZero())
+            snapshot_it->hardware.uuid = id;
+        updateSnapshotHardwareUUIDs(snapshot_it->llChildSnapshots, id);
+    }
+}
+
 // The public class
 /////////////////////////////////////////////////////////////////////////////
@@ -1008 +1021 @@
          * configuration dataset. */
         settings::MachineConfigFile trgMCF = *d->pSrcMachine->mData->pMachineConfigFile;
+
+        /* keep source machine hardware UUID if enabled*/
+        if (d->options.contains(CloneOptions_KeepHwUUIDs))
+        {
+            /* because HW UUIDs must be preserved including snapshots by the option,
+             * just fill zero UUIDs with corresponding machine UUID before any snapshot
+             * processing will take place, while all uuids are from source machine */
+            if (!trgMCF.hardwareMachine.uuid.isValid() || trgMCF.hardwareMachine.uuid.isZero())
+                trgMCF.hardwareMachine.uuid = trgMCF.uuid;
+
+            MachineCloneVMPrivate::updateSnapshotHardwareUUIDs(trgMCF.llFirstSnapshot, trgMCF.uuid);
+        }
+
 
         /* Reset media registry. */