Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (revision 37530) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (revision 37531) @@ -392,8 +392,14 @@ trgMachine.asOutParam()), RTEXITCODE_FAILURE); + + /* Clone options */ + com::SafeArray options; + options.push_back(CloneOptions_KeepNATMACs); + + /* Start the cloning */ ComPtr progress; CHECK_ERROR_RET(srcMachine, CloneTo(trgMachine, mode, - FALSE, + ComSafeArrayAsInParam(options), progress.asOutParam()), RTEXITCODE_FAILURE); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp (revision 37530) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UICloneVMWizard.cpp (revision 37531) @@ -80,6 +80,12 @@ } + /* NAT network adapters should keep there MAC address to prevent any + * reactivation. For the other modes they should be regenerated to prevent + * address conflicts in the network. */ + QVector options; + options.append(KCloneOptions_KeepNATMACs); + /* Start cloning. */ - CProgress progress = m_machine.CloneTo(cloneMachine, mode, false); + CProgress progress = m_machine.CloneTo(cloneMachine, mode, options); if (!m_machine.isOk()) { Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 37530) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 37531) @@ -3529,8 +3529,8 @@ - Clone the state of the machine. + Clone the state of the selected machine. - Clone the state of the machine and if this machine object has child snapshots the state of this childs. + Clone the state of the selected machine and if this machine object has child snapshots the state of this childs. @@ -3540,8 +3540,29 @@ + + + + Clone options, used with . + + + + Create a clone VM where all virtual disks are linked to the original VM. + + + Don't generate new MAC addresses of the attached network adapters. + + + Don't generate new MAC addresses of the attached network adapters when they are using NAT. + + + + @@ -5966,19 +5987,16 @@ Creates a clone of this machine, either as a full clone (which means - creating independent copies of the hard disk media), or as a linked - clone (which uses its own differencing media, sharing the parent media - with the source machine). - - The target machine object must have been created previously with - , and all the settings will be - transferred except the VM name, hardware UUID and the network card - MAC addresses. These can be set after the clone operation if required. - The operation is performed asynchronously, so the machine object will - be not be usable until the @a progress object signals completion. If - any step of the machine clone operation fails this will abort the - operation. The result will be a machine which is not a complete clone. - It is the responsibility of the caller to delete this incomplete - machine if desired with and/or - . + creating independent copies of the hard disk media, save states and so + on), or as a linked clone (which uses its own differencing media, + sharing the parent media with the source machine). + + The target machine object must have been created previously with , and all the settings will be + transferred except the VM name and the hardware UUID. You can set the + VM name and the new hardware UUID when creating the target machine. The + network MAC addresses are newly created for all newtwork adapters. You + can change that behaviour with the options parameter. The operation is + performed asynchronously, so the machine object will be not be usable + until the @a progress object signals completion. @@ -5993,6 +6011,6 @@ Which states should be cloned. - - Selects whether a full or linked clone is created. + + Options for the cloning operation. @@ -8205,7 +8223,7 @@ Don't show the started process according to the guest OS guidelines. - - Do not use the user's profile data when exeuting a process. - + + Do not use the user's profile data when exeuting a process. + Index: /trunk/src/VBox/Main/include/MachineImpl.h =================================================================== --- /trunk/src/VBox/Main/include/MachineImpl.h (revision 37530) +++ /trunk/src/VBox/Main/include/MachineImpl.h (revision 37531) @@ -529,5 +529,5 @@ STDMETHOD(AttachHostPciDevice(LONG hostAddress, LONG desiredGuestAddress, BOOL tryToUnbind)); STDMETHOD(DetachHostPciDevice(LONG hostAddress)); - STDMETHOD(CloneTo(IMachine *aTarget, CloneMode_T mode, BOOL aFullClone, IProgress **aProgress)); + STDMETHOD(CloneTo(IMachine *pTarget, CloneMode_T mode, ComSafeArrayIn(CloneOptions_T, options), IProgress **pProgress)); // public methods only for internal purposes Index: /trunk/src/VBox/Main/include/MachineImplCloneVM.h =================================================================== --- /trunk/src/VBox/Main/include/MachineImplCloneVM.h (revision 37530) +++ /trunk/src/VBox/Main/include/MachineImplCloneVM.h (revision 37531) @@ -27,5 +27,5 @@ { public: - MachineCloneVM(ComObjPtr pSrcMachine, ComObjPtr pTrgMachine, CloneMode_T mode, bool fFullClone); + MachineCloneVM(ComObjPtr pSrcMachine, ComObjPtr pTrgMachine, CloneMode_T mode, const RTCList &opts); ~MachineCloneVM(); Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 37530) +++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 37531) @@ -6074,5 +6074,5 @@ } -STDMETHODIMP Machine::CloneTo(IMachine *pTarget, CloneMode_T mode, BOOL fFullClone, IProgress **pProgress) +STDMETHODIMP Machine::CloneTo(IMachine *pTarget, CloneMode_T mode, ComSafeArrayIn(CloneOptions_T, options), IProgress **pProgress) { LogFlowFuncEnter(); @@ -6080,10 +6080,16 @@ CheckComArgNotNull(pTarget); CheckComArgOutPointerValid(pProgress); - AssertReturn(!fFullClone, E_NOTIMPL); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - - MachineCloneVM *pWorker = new MachineCloneVM(this, static_cast(pTarget), mode, fFullClone); + + /* Convert the options. */ + RTCList optList; + if (options != NULL) + optList = SafeArrayToRTCList(ComSafeArrayInArg(options)); + AssertReturn(!optList.contains(CloneOptions_Link), E_NOTIMPL); + AssertReturn(!(optList.contains(CloneOptions_KeepAllMACs) && optList.contains(CloneOptions_KeepNATMACs)), E_FAIL); + + AutoCaller autoCaller(this); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + + MachineCloneVM *pWorker = new MachineCloneVM(this, static_cast(pTarget), mode, optList); HRESULT rc = pWorker->start(pProgress); Index: /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (revision 37530) +++ /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (revision 37531) @@ -20,4 +20,5 @@ #include "VirtualBoxImpl.h" #include "MediumImpl.h" +#include "HostImpl.h" #include @@ -55,5 +56,5 @@ struct MachineCloneVMPrivate { - MachineCloneVMPrivate(MachineCloneVM *a_q, ComObjPtr &a_pSrcMachine, ComObjPtr &a_pTrgMachine, CloneMode_T a_mode, bool a_fFullClone) + MachineCloneVMPrivate(MachineCloneVM *a_q, ComObjPtr &a_pSrcMachine, ComObjPtr &a_pTrgMachine, CloneMode_T a_mode, const RTCList &opts) : q_ptr(a_q) , p(a_pSrcMachine) @@ -61,5 +62,5 @@ , pTrgMachine(a_pTrgMachine) , mode(a_mode) - , fLinkDisks(!a_fFullClone) + , options(opts) {} @@ -91,10 +92,12 @@ /* Private helper methods */ - HRESULT cloneCreateMachineList(const ComPtr &pSnapshot, RTCList< ComObjPtr > &machineList) const; - settings::Snapshot cloneFindSnapshot(settings::MachineConfigFile *pMCF, const settings::SnapshotsList &snl, const Guid &id) const; - void cloneUpdateStorageLists(settings::StorageControllersList &sc, const Bstr &bstrOldId, const Bstr &bstrNewId) const; - void cloneUpdateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, const Bstr &bstrNewId) const; - void cloneUpdateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile) const; - static int cloneCopyStateFileProgress(unsigned uPercentage, void *pvUser); + HRESULT createMachineList(const ComPtr &pSnapshot, RTCList< ComObjPtr > &machineList) const; + settings::Snapshot findSnapshot(settings::MachineConfigFile *pMCF, const settings::SnapshotsList &snl, const Guid &id) const; + void updateMACAddresses(settings::NetworkAdaptersList &nwl) const; + void updateMACAddresses(settings::SnapshotsList &sl) const; + void updateStorageLists(settings::StorageControllersList &sc, const Bstr &bstrOldId, const Bstr &bstrNewId) const; + void updateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, const Bstr &bstrNewId) const; + void updateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile) const; + static int copyStateFileProgress(unsigned uPercentage, void *pvUser); /* Private q and parent pointer */ @@ -109,10 +112,10 @@ Guid snapshotId; CloneMode_T mode; - bool fLinkDisks; + RTCList options; RTCList llMedias; RTCList llSaveStateFiles; /* Snapshot UUID -> File path */ }; -HRESULT MachineCloneVMPrivate::cloneCreateMachineList(const ComPtr &pSnapshot, RTCList< ComObjPtr > &machineList) const +HRESULT MachineCloneVMPrivate::createMachineList(const ComPtr &pSnapshot, RTCList< ComObjPtr > &machineList) const { HRESULT rc = S_OK; @@ -131,5 +134,5 @@ for (size_t i = 0; i < sfaChilds.size(); ++i) { - rc = cloneCreateMachineList(sfaChilds[i], machineList); + rc = createMachineList(sfaChilds[i], machineList); if (FAILED(rc)) return rc; } @@ -138,5 +141,5 @@ } -settings::Snapshot MachineCloneVMPrivate::cloneFindSnapshot(settings::MachineConfigFile *pMCF, const settings::SnapshotsList &snl, const Guid &id) const +settings::Snapshot MachineCloneVMPrivate::findSnapshot(settings::MachineConfigFile *pMCF, const settings::SnapshotsList &snl, const Guid &id) const { settings::SnapshotsList::const_iterator it; @@ -146,10 +149,34 @@ return *it; else if (!it->llChildSnapshots.empty()) - return cloneFindSnapshot(pMCF, it->llChildSnapshots, id); + return findSnapshot(pMCF, it->llChildSnapshots, id); } return settings::Snapshot(); } -void MachineCloneVMPrivate::cloneUpdateStorageLists(settings::StorageControllersList &sc, const Bstr &bstrOldId, const Bstr &bstrNewId) const +void MachineCloneVMPrivate::updateMACAddresses(settings::NetworkAdaptersList &nwl) const +{ + const bool fNotNAT = options.contains(CloneOptions_KeepNATMACs); + settings::NetworkAdaptersList::iterator it; + for (it = nwl.begin(); it != nwl.end(); ++it) + { + if ( fNotNAT + && it->mode == NetworkAttachmentType_NAT) + continue; + Host::generateMACAddress(it->strMACAddress); + } +} + +void MachineCloneVMPrivate::updateMACAddresses(settings::SnapshotsList &sl) const +{ + settings::SnapshotsList::iterator it; + for (it = sl.begin(); it != sl.end(); ++it) + { + updateMACAddresses(it->hardware.llNetworkAdapters); + if (!it->llChildSnapshots.empty()) + updateMACAddresses(it->llChildSnapshots); + } +} + +void MachineCloneVMPrivate::updateStorageLists(settings::StorageControllersList &sc, const Bstr &bstrOldId, const Bstr &bstrNewId) const { settings::StorageControllersList::iterator it3; @@ -173,5 +200,5 @@ } -void MachineCloneVMPrivate::cloneUpdateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, const Bstr &bstrNewId) const +void MachineCloneVMPrivate::updateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, const Bstr &bstrNewId) const { settings::SnapshotsList::iterator it; @@ -180,11 +207,11 @@ ++it) { - cloneUpdateStorageLists(it->storage.llStorageControllers, bstrOldId, bstrNewId); + updateStorageLists(it->storage.llStorageControllers, bstrOldId, bstrNewId); if (!it->llChildSnapshots.empty()) - cloneUpdateSnapshotStorageLists(it->llChildSnapshots, bstrOldId, bstrNewId); - } -} - -void MachineCloneVMPrivate::cloneUpdateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile) const + updateSnapshotStorageLists(it->llChildSnapshots, bstrOldId, bstrNewId); + } +} + +void MachineCloneVMPrivate::updateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile) const { settings::SnapshotsList::iterator it; @@ -194,10 +221,10 @@ it->strStateFile = strFile; else if (!it->llChildSnapshots.empty()) - cloneUpdateStateFile(it->llChildSnapshots, id, strFile); + updateStateFile(it->llChildSnapshots, id, strFile); } } /* static */ -int MachineCloneVMPrivate::cloneCopyStateFileProgress(unsigned uPercentage, void *pvUser) +int MachineCloneVMPrivate::copyStateFileProgress(unsigned uPercentage, void *pvUser) { ComObjPtr pProgress = *static_cast< ComObjPtr* >(pvUser); @@ -215,10 +242,9 @@ } - // The public class ///////////////////////////////////////////////////////////////////////////// -MachineCloneVM::MachineCloneVM(ComObjPtr pSrcMachine, ComObjPtr pTrgMachine, CloneMode_T mode, bool fFullClone) - : d_ptr(new MachineCloneVMPrivate(this, pSrcMachine, pTrgMachine, mode, fFullClone)) +MachineCloneVM::MachineCloneVM(ComObjPtr pSrcMachine, ComObjPtr pTrgMachine, CloneMode_T mode, const RTCList &opts) + : d_ptr(new MachineCloneVMPrivate(this, pSrcMachine, pTrgMachine, mode, opts)) { } @@ -283,5 +309,5 @@ rc = d->pSrcMachine->FindSnapshot(Bstr(id).raw(), pSnapshot.asOutParam()); if (FAILED(rc)) throw rc; - rc = d->cloneCreateMachineList(pSnapshot, machineList); + rc = d->createMachineList(pSnapshot, machineList); if (FAILED(rc)) throw rc; if (d->mode == CloneMode_MachineAndChildStates) @@ -444,5 +470,5 @@ settings::Snapshot sn; if (!d->snapshotId.isEmpty()) - sn = d->cloneFindSnapshot(&trgMCF, trgMCF.llFirstSnapshot, d->snapshotId); + sn = d->findSnapshot(&trgMCF, trgMCF.llFirstSnapshot, d->snapshotId); if (d->mode == CloneMode_MachineState) @@ -469,4 +495,11 @@ trgMCF.llFirstSnapshot.clear(); trgMCF.llFirstSnapshot.push_back(sn); + } + + /* Generate new MAC addresses for all machines when not forbidden. */ + if (!d->options.contains(CloneOptions_KeepAllMACs)) + { + d->updateMACAddresses(trgMCF.hardwareMachine.llNetworkAdapters); + d->updateMACAddresses(trgMCF.llFirstSnapshot); } @@ -642,6 +675,6 @@ /* We have to patch the configuration, so it contains the new * medium uuid instead of the old one. */ - d->cloneUpdateStorageLists(trgMCF.storageMachine.llStorageControllers, bstrSrcId, bstrTrgId); - d->cloneUpdateSnapshotStorageLists(trgMCF.llFirstSnapshot, bstrSrcId, bstrTrgId); + d->updateStorageLists(trgMCF.storageMachine.llStorageControllers, bstrSrcId, bstrTrgId); + d->updateSnapshotStorageLists(trgMCF.llFirstSnapshot, bstrSrcId, bstrTrgId); } /* Clone all save state files. */ @@ -657,5 +690,5 @@ if (!newFiles.contains(strTrgSaveState.c_str())) { - int vrc = RTFileCopyEx(sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), 0, MachineCloneVMPrivate::cloneCopyStateFileProgress, &d->pProgress); + int vrc = RTFileCopyEx(sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), 0, MachineCloneVMPrivate::copyStateFileProgress, &d->pProgress); if (RT_FAILURE(vrc)) throw p->setError(VBOX_E_IPRT_ERROR, @@ -668,5 +701,5 @@ trgMCF.strStateFile = strTrgSaveState; else - d->cloneUpdateStateFile(trgMCF.llFirstSnapshot, sst.snapshotUuid, strTrgSaveState); + d->updateStateFile(trgMCF.llFirstSnapshot, sst.snapshotUuid, strTrgSaveState); }