Index: /trunk/doc/manual/en_US/user_VBoxManage.xml
===================================================================
--- /trunk/doc/manual/en_US/user_VBoxManage.xml (revision 37970)
+++ /trunk/doc/manual/en_US/user_VBoxManage.xml (revision 37971)
@@ -1092,5 +1092,5 @@
VBoxManage clonevm
- This command creates a full copy of an existing virtual
+ This command creates a full or linked copy of an existing virtual
machine.
@@ -1118,10 +1118,12 @@
- --options keepallmacs|keepnatmacs|keepdisknames:
- Allows additional fine tuning of the clone operation. The first two
+ --options link|keepallmacs|keepnatmacs|keepdisknames:
+ Allows additional fine tuning of the clone operation. The first
+ option defines that a linked clone should be created, which is
+ only possible for a machine clone from a snapshot. The next two
options allow to define how the MAC addresses of every virtual
network card should be handled. They can either be reinitialized
- (the default), leaved unchanged
- (keepallmacs) or leaved unchanged
+ (the default), left unchanged
+ (keepallmacs) or left unchanged
when the network type is NAT
(keepnatmacs). If you add
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 37970)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 37971)
@@ -336,5 +336,6 @@
" [--snapshot |]\n"
" [--mode machine|machineandchilds|all]\n"
- " [--options keepallmacs|keepnatmacs|keepdisknames]\n"
+ " [--options link|keepallmacs|keepnatmacs|\n"
+ " keepdisknames]\n"
" [--name ]\n"
" [--basefolder ]\n"
Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (revision 37970)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (revision 37971)
@@ -311,6 +311,7 @@
else if (!RTStrNICmp(psz, "KeepDiskNames", len))
options->push_back(CloneOptions_KeepDiskNames);
-// else if (!RTStrNICmp(psz, "Link", len))
-// options->push_back(CloneOptions_Link)
+ else if ( !RTStrNICmp(psz, "Link", len)
+ || !RTStrNICmp(psz, "Linked", len))
+ options->push_back(CloneOptions_Link);
else
rc = VERR_PARSE_ERROR;
Index: /trunk/src/VBox/Main/include/MachineImplCloneVM.h
===================================================================
--- /trunk/src/VBox/Main/include/MachineImplCloneVM.h (revision 37970)
+++ /trunk/src/VBox/Main/include/MachineImplCloneVM.h (revision 37971)
@@ -34,4 +34,8 @@
protected:
HRESULT run();
+ HRESULT createDiffHelper(const ComObjPtr &pParent,
+ const Utf8Str &strSnapshotFolder,
+ RTCList > *pNewMedia,
+ ComObjPtr *ppDiff);
void destroy();
Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 37970)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 37971)
@@ -6260,9 +6260,10 @@
optList = com::SafeArray(ComSafeArrayInArg(options)).toList();
- AssertReturn(!optList.contains(CloneOptions_Link), E_NOTIMPL);
+ AssertReturn(!optList.contains(CloneOptions_Link) || (isSnapshotMachine() && mode == CloneMode_MachineState), E_INVALIDARG);
AssertReturn(!(optList.contains(CloneOptions_KeepAllMACs) && optList.contains(CloneOptions_KeepNATMACs)), E_INVALIDARG);
AutoCaller autoCaller(this);
if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
MachineCloneVM *pWorker = new MachineCloneVM(this, static_cast(pTarget), mode, optList);
@@ -9455,7 +9456,7 @@
/**
* Deletes implicit differencing hard disks created either by
- * #createImplicitDiffs() or by #AttachMedium() and rolls back mMediaData.
- *
- * Note that to delete hard disks created by #AttachMedium() this method is
+ * #createImplicitDiffs() or by #AttachDevice() and rolls back mMediaData.
+ *
+ * Note that to delete hard disks created by #AttachDevice() this method is
* called from #fixupMedia() when the changes are rolled back.
*
Index: /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (revision 37970)
+++ /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (revision 37971)
@@ -36,5 +36,5 @@
ComPtr pMedium;
ULONG uWeight;
-}MEDIUMTASK;
+} MEDIUMTASK;
typedef struct
@@ -42,5 +42,6 @@
RTCList chain;
bool fCreateDiffs;
-}MEDIUMTASKCHAIN;
+ bool fAttachLinked;
+} MEDIUMTASKCHAIN;
typedef struct
@@ -49,5 +50,5 @@
Utf8Str strSaveStateFile;
ULONG uWeight;
-}SAVESTATETASK;
+} SAVESTATETASK;
// The private class
@@ -330,4 +331,10 @@
if (machine == d->pOldMachineState)
fCreateDiffs = true;
+ /* If we want to create a linked clone just attach the medium
+ * associated with the snapshot. The rest is taken care of by
+ * attach already, so no need to duplicate this. */
+ bool fAttachLinked = false;
+ if (d->options.contains(CloneOptions_Link))
+ fAttachLinked = true;
SafeIfaceArray sfaAttachments;
rc = machine->COMGETTER(MediumAttachments)(ComSafeArrayAsOutParam(sfaAttachments));
@@ -358,5 +365,7 @@
MEDIUMTASKCHAIN mtc;
mtc.fCreateDiffs = fCreateDiffs;
- while(!pSrcMedium.isNull())
+ mtc.fAttachLinked = fAttachLinked;
+
+ if (d->mode == CloneMode_MachineState)
{
/* Refresh the state so that the file size get read. */
@@ -371,30 +380,69 @@
MEDIUMTASK mt;
mt.pMedium = pSrcMedium;
- mt.uWeight = (lSize + _1M - 1) / _1M;
+ if (fAttachLinked)
+ mt.uWeight = 0; /* dummy */
+ else
+ mt.uWeight = (lSize + _1M - 1) / _1M;
mtc.chain.append(mt);
-
- /* Query next parent. */
- rc = pSrcMedium->COMGETTER(Parent)(pSrcMedium.asOutParam());
- if (FAILED(rc)) throw rc;
- };
- /* Currently the creation of diff images involves reading at least
- * the biggest parent in the previous chain. So even if the new
- * diff image is small in size, it could need some time to create
- * it. Adding the biggest size in the chain should balance this a
- * little bit more, i.e. the weight is the sum of the data which
- * needs to be read and written. */
- uint64_t uMaxSize = 0;
- for (size_t e = mtc.chain.size(); e > 0; --e)
+ }
+ else
{
- MEDIUMTASK &mt = mtc.chain.at(e - 1);
- mt.uWeight += uMaxSize;
-
- /* Calculate progress data */
+ /** @todo r=klaus this puts way too many images in the list
+ * when cloning a snapshot (sub)tree, which means that more
+ * images are cloned than necessary. It is just the easiest
+ * way to get a working VM, as getting the image
+ * parent/child relationships right for only the bare
+ * minimum cloning is rather tricky. */
+ while (!pSrcMedium.isNull())
+ {
+ /* Refresh the state so that the file size get read. */
+ MediumState_T e;
+ rc = pSrcMedium->RefreshState(&e);
+ if (FAILED(rc)) throw rc;
+ LONG64 lSize;
+ rc = pSrcMedium->COMGETTER(Size)(&lSize);
+ if (FAILED(rc)) throw rc;
+
+ /* Save the current medium, for later cloning. */
+ MEDIUMTASK mt;
+ mt.pMedium = pSrcMedium;
+ mt.uWeight = (lSize + _1M - 1) / _1M;
+ mtc.chain.append(mt);
+
+ /* Query next parent. */
+ rc = pSrcMedium->COMGETTER(Parent)(pSrcMedium.asOutParam());
+ if (FAILED(rc)) throw rc;
+ }
+ }
+
+ if (fAttachLinked)
+ {
+ /* Implicit diff creation as part of attach is a pretty cheap
+ * operation, and does only need one operation per attachment. */
++uCount;
- uTotalWeight += mt.uWeight;
-
- /* Save the max size for better weighting of diff image
- * creation. */
- uMaxSize = RT_MAX(uMaxSize, mt.uWeight);
+ uTotalWeight += 1; /* 1MB per attachment */
+ }
+ else
+ {
+ /* Currently the copying of diff images involves reading at least
+ * the biggest parent in the previous chain. So even if the new
+ * diff image is small in size, it could need some time to create
+ * it. Adding the biggest size in the chain should balance this a
+ * little bit more, i.e. the weight is the sum of the data which
+ * needs to be read and written. */
+ uint64_t uMaxSize = 0;
+ for (size_t e = mtc.chain.size(); e > 0; --e)
+ {
+ MEDIUMTASK &mt = mtc.chain.at(e - 1);
+ mt.uWeight += uMaxSize;
+
+ /* Calculate progress data */
+ ++uCount;
+ uTotalWeight += mt.uWeight;
+
+ /* Save the max size for better weighting of diff image
+ * creation. */
+ uMaxSize = RT_MAX(uMaxSize, mt.uWeight);
+ }
}
d->llMedias.append(mtc);
@@ -472,5 +520,5 @@
strTrgMachineFolder.stripFilename();
- RTCList< ComObjPtr > newMedias; /* All created images */
+ RTCList > newMedia; /* All created images */
RTCList newFiles; /* All extra created files (save states, ...) */
try
@@ -499,7 +547,7 @@
trgMCF.llFirstSnapshot.clear();
trgMCF.uuidCurrentSnapshot.clear();
- }else
- if ( d->mode == CloneMode_MachineAndChildStates
- && !sn.uuid.isEmpty())
+ }
+ else if ( d->mode == CloneMode_MachineAndChildStates
+ && !sn.uuid.isEmpty())
{
/* Copy the snapshot data to the current machine. */
@@ -569,130 +617,158 @@
if (FAILED(rc)) throw rc;
- /* Is a clone already there? */
- TStrMediumMap::iterator it = map.find(Utf8Str(bstrSrcId));
- if (it != map.end())
- pNewParent = it->second;
+ if (mtc.fAttachLinked)
+ {
+ IMedium *pTmp = pMedium;
+ ComObjPtr pLMedium = static_cast(pTmp);
+ if (pLMedium.isNull())
+ throw E_POINTER;
+ if (pLMedium->isReadOnly())
+ {
+ ComObjPtr pDiff;
+ /* create the diff under the snapshot medium */
+ rc = createDiffHelper(pLMedium, strTrgSnapshotFolder,
+ &newMedia, &pDiff);
+ if (FAILED(rc)) throw rc;
+ map.insert(TStrMediumPair(Utf8Str(bstrSrcId), pDiff));
+ /* diff image has to be used... */
+ pNewParent = pDiff;
+ }
+ else
+ {
+ /* Attach the medium directly, as its type is not
+ * subject to diff creation. */
+ newMedia.append(pLMedium);
+ map.insert(TStrMediumPair(Utf8Str(bstrSrcId), pLMedium));
+ pNewParent = pLMedium;
+ }
+ }
else
{
- ComPtr pSrcFormat;
- rc = pMedium->COMGETTER(MediumFormat)(pSrcFormat.asOutParam());
- ULONG uSrcCaps = 0;
- rc = pSrcFormat->COMGETTER(Capabilities)(&uSrcCaps);
- if (FAILED(rc)) throw rc;
-
- /* Default format? */
- Utf8Str strDefaultFormat;
- p->mParent->getDefaultHardDiskFormat(strDefaultFormat);
- Bstr bstrSrcFormat(strDefaultFormat);
- ULONG srcVar = MediumVariant_Standard;
- /* Is the source file based? */
- if ((uSrcCaps & MediumFormatCapabilities_File) == MediumFormatCapabilities_File)
+ /* Is a clone already there? */
+ TStrMediumMap::iterator it = map.find(Utf8Str(bstrSrcId));
+ if (it != map.end())
+ pNewParent = it->second;
+ else
{
- /* Yes, just use the source format. Otherwise the defaults
- * will be used. */
- rc = pMedium->COMGETTER(Format)(bstrSrcFormat.asOutParam());
- if (FAILED(rc)) throw rc;
- rc = pMedium->COMGETTER(Variant)(&srcVar);
- if (FAILED(rc)) throw rc;
+ ComPtr pSrcFormat;
+ rc = pMedium->COMGETTER(MediumFormat)(pSrcFormat.asOutParam());
+ ULONG uSrcCaps = 0;
+ rc = pSrcFormat->COMGETTER(Capabilities)(&uSrcCaps);
+ if (FAILED(rc)) throw rc;
+
+ /* Default format? */
+ Utf8Str strDefaultFormat;
+ p->mParent->getDefaultHardDiskFormat(strDefaultFormat);
+ Bstr bstrSrcFormat(strDefaultFormat);
+ ULONG srcVar = MediumVariant_Standard;
+ /* Is the source file based? */
+ if ((uSrcCaps & MediumFormatCapabilities_File) == MediumFormatCapabilities_File)
+ {
+ /* Yes, just use the source format. Otherwise the defaults
+ * will be used. */
+ rc = pMedium->COMGETTER(Format)(bstrSrcFormat.asOutParam());
+ if (FAILED(rc)) throw rc;
+ rc = pMedium->COMGETTER(Variant)(&srcVar);
+ if (FAILED(rc)) throw rc;
+ }
+
+ Guid newId;
+ newId.create();
+ Utf8Str strNewName(bstrSrcName);
+ if (!fKeepDiskNames)
+ {
+ /* If the old disk name was in {uuid} format we also
+ * want the new name in this format, but with the
+ * updated id of course. If the old disk was called
+ * like the VM name, we change it to the new VM name.
+ * For all other disks we rename them with this
+ * template: "new name-disk1.vdi". */
+ Utf8Str strSrcTest = Utf8Str(bstrSrcName).stripExt();
+ if (strSrcTest == strOldVMName)
+ strNewName = Utf8StrFmt("%s%s", trgMCF.machineUserData.strName.c_str(), RTPathExt(Utf8Str(bstrSrcName).c_str()));
+ else if ( strSrcTest.startsWith("{")
+ && strSrcTest.endsWith("}"))
+ {
+ strSrcTest = strSrcTest.substr(1, strSrcTest.length() - 2);
+ if (isValidGuid(strSrcTest))
+ strNewName = Utf8StrFmt("%s%s", newId.toStringCurly().c_str(), RTPathExt(strNewName.c_str()));
+ }
+ else
+ strNewName = Utf8StrFmt("%s-disk%d%s", trgMCF.machineUserData.strName.c_str(), ++cDisks, RTPathExt(Utf8Str(bstrSrcName).c_str()));
+ }
+
+ /* Check if this medium comes from the snapshot folder, if
+ * so, put it there in the cloned machine as well.
+ * Otherwise it goes to the machine folder. */
+ Bstr bstrSrcPath;
+ Utf8Str strFile = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
+ rc = pMedium->COMGETTER(Location)(bstrSrcPath.asOutParam());
+ if (FAILED(rc)) throw rc;
+ if ( !bstrSrcPath.isEmpty()
+ && RTPathStartsWith(Utf8Str(bstrSrcPath).c_str(), Utf8Str(bstrSrcSnapshotFolder).c_str()))
+ strFile = Utf8StrFmt("%s%c%s", strTrgSnapshotFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
+ else
+ strFile = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
+
+ /* Start creating the clone. */
+ ComObjPtr pTarget;
+ rc = pTarget.createObject();
+ if (FAILED(rc)) throw rc;
+
+ rc = pTarget->init(p->mParent,
+ Utf8Str(bstrSrcFormat),
+ strFile,
+ Guid::Empty, /* empty media registry */
+ NULL /* llRegistriesThatNeedSaving */);
+ if (FAILED(rc)) throw rc;
+
+ /* Update the new uuid. */
+ pTarget->updateId(newId);
+
+ srcLock.release();
+ /* Do the disk cloning. */
+ ComPtr progress2;
+ rc = pMedium->CloneTo(pTarget,
+ srcVar,
+ pNewParent,
+ progress2.asOutParam());
+ if (FAILED(rc)) throw rc;
+
+ /* Wait until the async process has finished. */
+ rc = d->pProgress->WaitForAsyncProgressCompletion(progress2);
+ srcLock.acquire();
+ if (FAILED(rc)) throw rc;
+
+ /* Check the result of the async process. */
+ LONG iRc;
+ rc = progress2->COMGETTER(ResultCode)(&iRc);
+ if (FAILED(rc)) throw rc;
+ if (FAILED(iRc))
+ {
+ /* If the thread of the progress object has an error, then
+ * retrieve the error info from there, or it'll be lost. */
+ ProgressErrorInfo info(progress2);
+ throw p->setError(iRc, Utf8Str(info.getText()).c_str());
+ }
+ /* Remember created medium. */
+ newMedia.append(pTarget);
+ /* Get the medium type from the source and set it to the
+ * new medium. */
+ MediumType_T type;
+ rc = pMedium->COMGETTER(Type)(&type);
+ if (FAILED(rc)) throw rc;
+ rc = pTarget->COMSETTER(Type)(type);
+ if (FAILED(rc)) throw rc;
+ map.insert(TStrMediumPair(Utf8Str(bstrSrcId), pTarget));
+ /* register the new harddisk */
+ {
+ AutoWriteLock tlock(p->mParent->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
+ rc = p->mParent->registerHardDisk(pTarget, NULL /* pllRegistriesThatNeedSaving */);
+ if (FAILED(rc)) throw rc;
+ }
+ /* This medium becomes the parent of the next medium in the
+ * chain. */
+ pNewParent = pTarget;
}
-
- Guid newId;
- newId.create();
- Utf8Str strNewName(bstrSrcName);
- if (!fKeepDiskNames)
- {
- /* If the old disk name was in {uuid} format we also
- * want the new name in this format, but with the
- * updated id of course. If the old disk was called
- * like the VM name, we change it to the new VM name.
- * For all other disks we rename them with this
- * template: "new name-disk1.vdi". */
- Utf8Str strSrcTest = Utf8Str(bstrSrcName).stripExt();
- if (strSrcTest == strOldVMName)
- strNewName = Utf8StrFmt("%s%s", trgMCF.machineUserData.strName.c_str(), RTPathExt(Utf8Str(bstrSrcName).c_str()));
- else
- if (strSrcTest.startsWith("{") &&
- strSrcTest.endsWith("}"))
- {
- strSrcTest = strSrcTest.substr(1, strSrcTest.length() - 2);
- if (isValidGuid(strSrcTest))
- strNewName = Utf8StrFmt("%s%s", newId.toStringCurly().c_str(), RTPathExt(strNewName.c_str()));
- }
- else
- strNewName = Utf8StrFmt("%s-disk%d%s", trgMCF.machineUserData.strName.c_str(), ++cDisks, RTPathExt(Utf8Str(bstrSrcName).c_str()));
- }
-
- /* Check if this medium comes from the snapshot folder, if
- * so, put it there in the cloned machine as well.
- * Otherwise it goes to the machine folder. */
- Bstr bstrSrcPath;
- Utf8Str strFile = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
- rc = pMedium->COMGETTER(Location)(bstrSrcPath.asOutParam());
- if (FAILED(rc)) throw rc;
- if ( !bstrSrcPath.isEmpty()
- && RTPathStartsWith(Utf8Str(bstrSrcPath).c_str(), Utf8Str(bstrSrcSnapshotFolder).c_str()))
- strFile = Utf8StrFmt("%s%c%s", strTrgSnapshotFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
- else
- strFile = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, strNewName.c_str());
-
- /* Start creating the clone. */
- ComObjPtr pTarget;
- rc = pTarget.createObject();
- if (FAILED(rc)) throw rc;
-
- rc = pTarget->init(p->mParent,
- Utf8Str(bstrSrcFormat),
- strFile,
- Guid::Empty, /* empty media registry */
- NULL /* llRegistriesThatNeedSaving */);
- if (FAILED(rc)) throw rc;
-
- /* Update the new uuid. */
- pTarget->updateId(newId);
-
- srcLock.release();
- /* Do the disk cloning. */
- ComPtr progress2;
- rc = pMedium->CloneTo(pTarget,
- srcVar,
- pNewParent,
- progress2.asOutParam());
- if (FAILED(rc)) throw rc;
-
- /* Wait until the asynchrony process has finished. */
- rc = d->pProgress->WaitForAsyncProgressCompletion(progress2);
- srcLock.acquire();
- if (FAILED(rc)) throw rc;
-
- /* Check the result of the asynchrony process. */
- LONG iRc;
- rc = progress2->COMGETTER(ResultCode)(&iRc);
- if (FAILED(rc)) throw rc;
- if (FAILED(iRc))
- {
- /* If the thread of the progress object has an error, then
- * retrieve the error info from there, or it'll be lost. */
- ProgressErrorInfo info(progress2);
- throw p->setError(iRc, Utf8Str(info.getText()).c_str());
- }
- /* Remember created medias. */
- newMedias.append(pTarget);
- /* Get the medium type from the source and set it to the
- * new medium. */
- MediumType_T type;
- rc = pMedium->COMGETTER(Type)(&type);
- if (FAILED(rc)) throw rc;
- rc = pTarget->COMSETTER(Type)(type);
- if (FAILED(rc)) throw rc;
- map.insert(TStrMediumPair(Utf8Str(bstrSrcId), pTarget));
- /* Global register the new harddisk */
- {
- AutoWriteLock tlock(p->mParent->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
- rc = p->mParent->registerHardDisk(pTarget, NULL /* pllRegistriesThatNeedSaving */);
- if (FAILED(rc)) return rc;
- }
- /* This medium becomes the parent of the next medium in the
- * chain. */
- pNewParent = pTarget;
}
}
@@ -701,41 +777,19 @@
if (mtc.fCreateDiffs)
{
- Bstr bstrSrcId;
- rc = pNewParent->COMGETTER(Id)(bstrSrcId.asOutParam());
- if (FAILED(rc)) throw rc;
- ComObjPtr diff;
- diff.createObject();
- rc = diff->init(p->mParent,
- pNewParent->getPreferredDiffFormat(),
- Utf8StrFmt("%s%c", strTrgSnapshotFolder.c_str(), RTPATH_DELIMITER),
- Guid::Empty, /* empty media registry */
- NULL); /* pllRegistriesThatNeedSaving */
- if (FAILED(rc)) throw rc;
- MediumLockList *pMediumLockList(new MediumLockList());
- rc = diff->createMediumLockList(true /* fFailIfInaccessible */,
- true /* fMediumLockWrite */,
- pNewParent,
- *pMediumLockList);
- if (FAILED(rc)) throw rc;
- rc = pMediumLockList->Lock();
- if (FAILED(rc)) throw rc;
- rc = pNewParent->createDiffStorage(diff, MediumVariant_Standard,
- pMediumLockList,
- NULL /* aProgress */,
- true /* aWait */,
- NULL); // pllRegistriesThatNeedSaving
- delete pMediumLockList;
- if (FAILED(rc)) throw rc;
- /* Remember created medias. */
- newMedias.append(diff);
- /* Global register the new harddisk */
+ if (pNewParent->isReadOnly())
{
- AutoWriteLock tlock(p->mParent->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
- rc = p->mParent->registerHardDisk(diff, NULL /* pllRegistriesThatNeedSaving */);
- if (FAILED(rc)) return rc;
+ ComObjPtr pDiff;
+ rc = createDiffHelper(pNewParent, strTrgSnapshotFolder,
+ &newMedia, &pDiff);
+ if (FAILED(rc)) throw rc;
+ /* diff image has to be used... */
+ pNewParent = pDiff;
}
- /* This medium becomes the parent of the next medium in the
- * chain. */
- pNewParent = diff;
+ else
+ {
+ /* Attach the medium directly, as its type is not
+ * subject to diff creation. */
+ newMedia.append(pNewParent);
+ }
}
Bstr bstrSrcId;
@@ -752,11 +806,11 @@
/* Make sure all disks know of the new machine uuid. We do this last to
* be able to change the medium type above. */
- for (size_t i = newMedias.size(); i > 0; --i)
- {
- ComObjPtr &pMedium = newMedias.at(i - 1);
+ for (size_t i = newMedia.size(); i > 0; --i)
+ {
+ const ComObjPtr &pMedium = newMedia.at(i - 1);
AutoCaller mac(pMedium);
if (FAILED(mac.rc())) throw mac.rc();
AutoWriteLock mlock(pMedium COMMA_LOCKVAL_SRC_POS);
- pMedium->addRegistry(d->pTrgMachine->mData->mUuid, false /* fRecursive */);
+ pMedium->addRegistry(d->options.contains(CloneOptions_Link) ? d->pSrcMachine->mData->mUuid : d->pTrgMachine->mData->mUuid, false /* fRecurse */);
}
/* Check if a snapshot folder is necessary and if so doesn't already
@@ -812,6 +866,15 @@
rc = d->pTrgMachine->SaveSettings();
if (FAILED(rc)) throw rc;
- }
- catch(HRESULT rc2)
+ trgLock.release();
+ if (d->options.contains(CloneOptions_Link))
+ {
+ srcLock.release();
+ GuidList llRegistrySrc;
+ llRegistrySrc.push_back(d->pSrcMachine->mData->mUuid);
+ rc = p->mParent->saveRegistries(llRegistrySrc);
+ if (FAILED(rc)) throw rc;
+ }
+ }
+ catch (HRESULT rc2)
{
rc = rc2;
@@ -836,22 +899,11 @@
/* Delete all already created medias. (Reverse, cause there could be
* parent->child relations.) */
- for (size_t i = newMedias.size(); i > 0; --i)
- {
- bool fFile = false;
- Utf8Str strLoc;
- ComObjPtr &pMedium = newMedias.at(i - 1);
- {
- AutoCaller mac(pMedium);
- if (FAILED(mac.rc())) { continue; mrc = mac.rc(); }
- AutoReadLock mlock(pMedium COMMA_LOCKVAL_SRC_POS);
- fFile = pMedium->isMediumFormatFile();
- strLoc = pMedium->getLocationFull();
- }
- if (fFile)
- {
- vrc = RTFileDelete(strLoc.c_str());
- if (RT_FAILURE(vrc))
- mrc = p->setError(VBOX_E_IPRT_ERROR, p->tr("Could not delete file '%s' (%Rrc)"), strLoc.c_str(), vrc);
- }
+ for (size_t i = newMedia.size(); i > 0; --i)
+ {
+ const ComObjPtr &pMedium = newMedia.at(i - 1);
+ mrc = pMedium->deleteStorage(NULL /* aProgress */,
+ true /* aWait */,
+ NULL /* llRegistriesThatNeedSaving */);
+ pMedium->Close();
}
/* Delete the snapshot folder when not empty. */
@@ -865,4 +917,58 @@
}
+HRESULT MachineCloneVM::createDiffHelper(const ComObjPtr &pParent,
+ const Utf8Str &strSnapshotFolder,
+ RTCList< ComObjPtr > *pNewMedia,
+ ComObjPtr *ppDiff)
+{
+ DPTR(MachineCloneVM);
+ ComObjPtr &p = d->p;
+ HRESULT rc = S_OK;
+
+ try
+ {
+ Bstr bstrSrcId;
+ rc = pParent->COMGETTER(Id)(bstrSrcId.asOutParam());
+ if (FAILED(rc)) throw rc;
+ ComObjPtr diff;
+ diff.createObject();
+ rc = diff->init(p->mParent,
+ pParent->getPreferredDiffFormat(),
+ Utf8StrFmt("%s%c", strSnapshotFolder.c_str(), RTPATH_DELIMITER),
+ Guid::Empty, /* empty media registry */
+ NULL); /* pllRegistriesThatNeedSaving */
+ if (FAILED(rc)) throw rc;
+ MediumLockList *pMediumLockList(new MediumLockList());
+ rc = diff->createMediumLockList(true /* fFailIfInaccessible */,
+ true /* fMediumLockWrite */,
+ pParent,
+ *pMediumLockList);
+ if (FAILED(rc)) throw rc;
+ rc = pMediumLockList->Lock();
+ if (FAILED(rc)) throw rc;
+ /* this already registers the new diff image */
+ rc = pParent->createDiffStorage(diff, MediumVariant_Standard,
+ pMediumLockList,
+ NULL /* aProgress */,
+ true /* aWait */,
+ NULL); // pllRegistriesThatNeedSaving
+ delete pMediumLockList;
+ if (FAILED(rc)) throw rc;
+ /* Remember created medium. */
+ pNewMedia->append(diff);
+ *ppDiff = diff;
+ }
+ catch (HRESULT rc2)
+ {
+ rc = rc2;
+ }
+ catch (...)
+ {
+ rc = VirtualBox::handleUnexpectedExceptions(RT_SRC_POS);
+ }
+
+ return rc;
+}
+
void MachineCloneVM::destroy()
{