Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (revision 31332) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (revision 31333) @@ -159,26 +159,17 @@ if (machine) { - SafeArray abstrFiles; - CHECK_ERROR(machine, Unregister(fDelete /* fAutoCleanup */, - ComSafeArrayAsOutParam(abstrFiles))); + SafeIfaceArray aMedia; + CleanupMode_T cleanupMode = CleanupMode_DetachAllReturnNone; + if (fDelete) + cleanupMode = CleanupMode_DetachAllReturnHardDisksOnly; + CHECK_ERROR(machine, Unregister(cleanupMode, + ComSafeArrayAsOutParam(aMedia))); if (SUCCEEDED(rc)) { - for (size_t u = 0; - u < abstrFiles.size(); - ++u) - { - Utf8Str strFile(abstrFiles[u]); - if (fDelete) - { - RTPrintf("Deleting '%s'\n", strFile.c_str()); - RTFileDelete(strFile.c_str()); - } - else - RTPrintf("File '%s' is now obsolete and can be deleted\n", strFile.c_str()); - } - if (fDelete) { - CHECK_ERROR(machine, Delete()); + ComPtr pProgress; + CHECK_ERROR(machine, Delete(ComSafeArrayAsInParam(aMedia), pProgress.asOutParam())); + CHECK_ERROR(pProgress, WaitForCompletion(-1)); } } Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp (revision 31332) +++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSelectorWnd.cpp (revision 31333) @@ -680,9 +680,11 @@ { CMachine machine = item->machine(); - QVector files = machine.Unregister(false /*fDetachMedia*/); + QVector aMedia = machine.Unregister(KCleanupMode_UnregisterOnly); // @todo replace with DetachAllReturnHardDisksOnly once a progress dialog is in place below if (machine.isOk() && item->accessible()) { /* delete machine settings */ - machine.Delete(); + CProgress progress = machine.Delete(aMedia); + progress.WaitForCompletion(-1); // @todo do this nicely with a progress dialog, this can delete many files! + /* remove the item shortly: cmachine it refers to is no longer valid! */ int row = mVMModel->rowById (item->id()); Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (revision 31332) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (revision 31333) @@ -782,7 +782,10 @@ { /* Unregister on failure */ - QVector files = m_Machine.Unregister(false /*fDetachMedia*/); + QVector aMedia = m_Machine.Unregister(KCleanupMode_UnregisterOnly); // @todo replace with DetachAllReturnHardDisksOnly once a progress dialog is in place below if (vbox.isOk()) - m_Machine.Delete(); + { + CProgress progress = m_Machine.Delete(aMedia); + progress.WaitForCompletion(-1); // @todo do this nicely with a progress dialog, this can delete lots of files + } return false; } Index: /trunk/src/VBox/Main/ApplianceImplImport.cpp =================================================================== --- /trunk/src/VBox/Main/ApplianceImplImport.cpp (revision 31332) +++ /trunk/src/VBox/Main/ApplianceImplImport.cpp (revision 31333) @@ -1223,40 +1223,6 @@ { // with _whatever_ error we've had, do a complete roll-back of - // machines and disks we've created; unfortunately this is - // not so trivially done... - - HRESULT rc2; - // detach all hard disks from all machines we created - for (list::iterator itM = stack.llHardDiskAttachments.begin(); - itM != stack.llHardDiskAttachments.end(); - ++itM) - { - const MyHardDiskAttachment &mhda = *itM; - rc2 = mhda.pMachine->LockMachine(stack.pSession, LockType_Write); - if (SUCCEEDED(rc2)) - { - ComPtr sMachine; - rc2 = stack.pSession->COMGETTER(Machine)(sMachine.asOutParam()); - if (SUCCEEDED(rc2)) - { - rc2 = sMachine->DetachDevice(Bstr(mhda.controllerType), mhda.lControllerPort, mhda.lDevice); - rc2 = sMachine->SaveSettings(); - } - stack.pSession->UnlockMachine(); - } - } - - // now clean up all hard disks we created - for (list< ComPtr >::iterator itHD = stack.llHardDisksCreated.begin(); - itHD != stack.llHardDisksCreated.end(); - ++itHD) - { - ComPtr pDisk = *itHD; - ComPtr pProgress2; - rc2 = pDisk->DeleteStorage(pProgress2.asOutParam()); - rc2 = pProgress2->WaitForCompletion(-1); - } - - // finally, deregister and remove all machines + // machines and disks we've created + for (list::iterator itID = m->llGuidsMachinesCreated.begin(); itID != m->llGuidsMachinesCreated.end(); @@ -1266,10 +1232,12 @@ Bstr bstrGuid = guid.toUtf16(); ComPtr failedMachine; - SafeArray abstrPaths; - rc2 = mVirtualBox->GetMachine(bstrGuid, failedMachine.asOutParam()); + HRESULT rc2 = mVirtualBox->GetMachine(bstrGuid, failedMachine.asOutParam()); if (SUCCEEDED(rc2)) { - rc2 = failedMachine->Unregister(false, ComSafeArrayAsOutParam(abstrPaths)); - rc2 = failedMachine->Delete(); + SafeIfaceArray aMedia; + rc2 = failedMachine->Unregister(CleanupMode_DetachAllReturnHardDisksOnly, ComSafeArrayAsOutParam(aMedia)); + ComPtr pProgress2; + rc2 = failedMachine->Delete(ComSafeArrayAsInParam(aMedia), pProgress2.asOutParam()); + pProgress2->WaitForCompletion(-1); } } Index: /trunk/src/VBox/Main/MachineImpl.cpp =================================================================== --- /trunk/src/VBox/Main/MachineImpl.cpp (revision 31332) +++ /trunk/src/VBox/Main/MachineImpl.cpp (revision 31333) @@ -3974,6 +3974,6 @@ /** @note Locks objects! */ -STDMETHODIMP Machine::Unregister(BOOL fAutoCleanup, - ComSafeArrayOut(BSTR, aFiles)) +STDMETHODIMP Machine::Unregister(CleanupMode_T cleanupMode, + ComSafeArrayOut(IMedium*, aMedia)) { AutoCaller autoCaller(this); @@ -3989,9 +3989,4 @@ HRESULT rc = S_OK; - // this list collects the files that should be reported - // as to be deleted to the caller in aFiles (this includes the - // media files in llMedia below) - std::list llFilesForCaller; - // discard saved state if (mData->mMachineState == MachineState_Saved) @@ -3999,5 +3994,5 @@ // add the saved state file to the list of files the caller should delete Assert(!mSSData->mStateFilePath.isEmpty()); - llFilesForCaller.push_back(mSSData->mStateFilePath); + mData->llFilesToDelete.push_back(mSSData->mStateFilePath); mSSData->mStateFilePath.setNull(); @@ -4011,5 +4006,5 @@ if (mData->mFirstSnapshot) cSnapshots = mData->mFirstSnapshot->getAllChildrenCount() + 1; - if (cSnapshots && !fAutoCleanup) + if (cSnapshots && cleanupMode == CleanupMode_UnregisterOnly) // fail now before we start detaching media return setError(VBOX_E_INVALID_OBJECT_STATE, @@ -4034,6 +4029,6 @@ { // we have media attachments: detach them all and add the Medium objects to our list - if (fAutoCleanup) - detachAllMedia(alock, NULL /* pSnapshot */, llMedia); + if (cleanupMode != CleanupMode_UnregisterOnly) + detachAllMedia(alock, NULL /* pSnapshot */, cleanupMode, llMedia); else return setError(VBOX_E_INVALID_OBJECT_STATE, @@ -4061,9 +4056,8 @@ // GO! - pFirstSnapshot->uninitRecursively(alock, llMedia, llFilesForCaller); + pFirstSnapshot->uninitRecursively(alock, cleanupMode, llMedia, mData->llFilesToDelete); mData->mMachineState = oldState; } - if (FAILED(rc)) @@ -4081,43 +4075,7 @@ alock.release(); - if (fAutoCleanup) - { - // now go thru the list of attached media reported by prepareUnregister() and close them all - for (MediaList::const_iterator it = llMedia.begin(); - it != llMedia.end(); - ++it) - { - ComObjPtr pMedium = *it; - Utf8Str strFile = pMedium->getLocationFull(); - - AutoCaller autoCaller2(pMedium); - if (FAILED(autoCaller2.rc())) return autoCaller2.rc(); - - ErrorInfoKeeper eik; - rc = pMedium->close(NULL /*fNeedsSaveSettings*/, // we'll call saveSettings() in any case below - autoCaller2); - // this uninitializes the medium - - LogFlowThisFunc(("Medium::close() on %s yielded rc (%Rhra)\n", strFile.c_str(), rc)); - - if (rc == VBOX_E_OBJECT_IN_USE) - // can happen if the medium was still attached to another machine; - // do not report the file to the caller then, but don't report - // an error either - eik.setNull(); - else if (SUCCEEDED(rc)) - // report the path to the caller - llFilesForCaller.push_back(strFile); - } - } - - // report all paths to the caller - SafeArray sfaFiles(llFilesForCaller.size()); - size_t i = 0; - for (std::list::iterator it = llFilesForCaller.begin(); - it != llFilesForCaller.end(); - ++it) - Bstr(*it).detachTo(&sfaFiles[i++]); - sfaFiles.detachTo(ComSafeArrayOutArg(aFiles)); + // return media to caller + SafeIfaceArray sfaMedia(llMedia); + sfaMedia.detachTo(ComSafeArrayOutArg(aMedia)); mParent->unregisterMachine(this); @@ -4127,10 +4085,21 @@ } -STDMETHODIMP Machine::Delete() -{ +struct Machine::DeleteTask +{ + ComObjPtr pMachine; + std::list llFilesToDelete; + ComObjPtr pProgress; +}; + +STDMETHODIMP Machine::Delete(ComSafeArrayIn(IMedium*, aMedia), IProgress **aProgress) +{ + LogFlowFuncEnter(); + AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); + + bool fNeedsGlobalSaveSettings = false; HRESULT rc = checkStateDependency(MutableStateDep); @@ -4140,4 +4109,105 @@ return setError(VBOX_E_INVALID_VM_STATE, tr("Cannot delete settings of a registered machine")); + + DeleteTask *pTask = new DeleteTask; + pTask->pMachine = this; + com::SafeIfaceArray sfaMedia(ComSafeArrayInArg(aMedia)); + + // collect files to delete + pTask->llFilesToDelete = mData->llFilesToDelete; // saved states pushed here by Unregister() + for (size_t i = 0; i < sfaMedia.size(); ++i) + { + IMedium *pIMedium(sfaMedia[i]); + Medium *pMedium = static_cast(pIMedium); + AutoCaller mediumAutoCaller(pMedium); + if (FAILED(mediumAutoCaller.rc())) return mediumAutoCaller.rc(); + + Utf8Str bstrLocation = pMedium->getLocationFull(); + // close the medium now; if that succeeds, then that means the medium is no longer + // in use and we can add it to the list of files to delete + rc = pMedium->close(&fNeedsGlobalSaveSettings, mediumAutoCaller); + if (SUCCEEDED(rc)) + pTask->llFilesToDelete.push_back(bstrLocation); + } + if (mData->pMachineConfigFile->fileExists()) + pTask->llFilesToDelete.push_back(mData->m_strConfigFileFull); + + pTask->pProgress.createObject(); + pTask->pProgress->init(getVirtualBox(), + this /* aInitiator */, + Bstr(tr("Deleting files")), + true /* fCancellable */, + pTask->llFilesToDelete.size() + 1, // cOperations + BstrFmt(tr("Deleting '%s'"), pTask->llFilesToDelete.front().c_str())); + + int vrc = RTThreadCreate(NULL, + Machine::deleteThread, + (void*)pTask, + 0, + RTTHREADTYPE_MAIN_WORKER, + 0, + "MachineDelete"); + + alock.release(); + + if (fNeedsGlobalSaveSettings) + { + AutoWriteLock vboxlock(mParent COMMA_LOCKVAL_SRC_POS); + mParent->saveSettings(); + } + + if (RT_FAILURE(vrc)) + { + delete pTask; + return setError(E_FAIL, "Could not create MachineDelete thread (%Rrc)", vrc); + } + + pTask->pProgress.queryInterfaceTo(aProgress); + + LogFlowFuncLeave(); + + return S_OK; +} + +/** + * Static task wrapper passed to RTThreadCreate() in Machine::Delete() which then + * calls Machine::deleteTaskWorker() on the actual machine object. + * @param Thread + * @param pvUser + * @return + */ +/*static*/ +DECLCALLBACK(int) Machine::deleteThread(RTTHREAD Thread, void *pvUser) +{ + LogFlowFuncEnter(); + + DeleteTask *pTask = (DeleteTask*)pvUser; + Assert(pTask); + Assert(pTask->pMachine); + Assert(pTask->pProgress); + + HRESULT rc = pTask->pMachine->deleteTaskWorker(*pTask); + pTask->pProgress->notifyComplete(rc); + + delete pTask; + + LogFlowFuncLeave(); + + NOREF(Thread); + + return VINF_SUCCESS; +} + +/** + * Task thread implementation for Machine::Delete(), called from Machine::deleteThread(). + * @param task + * @return + */ +HRESULT Machine::deleteTaskWorker(DeleteTask &task) +{ + AutoCaller autoCaller(this); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + + AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); ULONG uLogHistoryCount = 3; @@ -4147,14 +4217,28 @@ systemProperties->COMGETTER(LogHistoryCount)(&uLogHistoryCount); + // delete the files pushed on the task list by Machine::Delete() + // (this includes saved states of the machine and snapshots and + // medium storage files from the IMedium list passed in, and the + // machine XML file) + std::list::const_iterator it = task.llFilesToDelete.begin(); + while (it != task.llFilesToDelete.end()) + { + const Utf8Str &strFile = *it; + LogFunc(("Deleting file %s\n", strFile.c_str())); + RTFileDelete(strFile.c_str()); + + ++it; + if (it == task.llFilesToDelete.end()) + { + task.pProgress->SetNextOperation(Bstr(tr("Cleaning up machine directory")), 1); + break; + } + + task.pProgress->SetNextOperation(BstrFmt(tr("Deleting '%s'"), it->c_str()), 1); + } + /* delete the settings only when the file actually exists */ if (mData->pMachineConfigFile->fileExists()) { - int vrc = RTFileDelete(mData->m_strConfigFileFull.c_str()); - if (RT_FAILURE(vrc)) - return setError(VBOX_E_IPRT_ERROR, - tr("Could not delete the settings file '%s' (%Rrc)"), - mData->m_strConfigFileFull.raw(), - vrc); - /* Delete any backup or uncommitted XML files. Ignore failures. See the fSafe parameter of xml::XmlFileWriter::write for details. */ @@ -8652,5 +8736,6 @@ /** * Goes thru all medium attachments of the list and calls detachDevice() on each - * of them and attaches all Medium objects found in the process to the given list. + * of them and attaches all Medium objects found in the process to the given list, + * depending on cleanupMode. * * This gets called from Machine::Unregister, both for the actual Machine and @@ -8660,10 +8745,13 @@ * * @param writeLock Machine lock from top-level caller; this gets passed to detachDevice. - * @param llMedia Caller's list to receive Medium objects which got detached so caller can close() them. * @param pSnapshot Must be NULL when called for a "real" Machine or a snapshot object if called for a SnapshotMachine. + * @param cleanupMode If DetachAllReturnHardDisksOnly, only hard disk media get added to llMedia; if Full, then all media get added; + * otherwise no media get added. + * @param llMedia Caller's list to receive Medium objects which got detached so caller can close() them, depending on cleanupMode. * @return */ HRESULT Machine::detachAllMedia(AutoWriteLock &writeLock, Snapshot *pSnapshot, + CleanupMode_T cleanupMode, MediaList &llMedia) { @@ -8684,5 +8772,12 @@ if (!pMedium.isNull()) - llMedia.push_back(pMedium); + { + DeviceType_T devType = pMedium->getDeviceType(); + if ( ( cleanupMode == CleanupMode_DetachAllReturnHardDisksOnly + && devType == DeviceType_HardDisk) + || (cleanupMode == CleanupMode_Full) + ) + llMedia.push_back(pMedium); + } // real machine: then we need to use the proper method Index: /trunk/src/VBox/Main/MediumImpl.cpp =================================================================== --- /trunk/src/VBox/Main/MediumImpl.cpp (revision 31332) +++ /trunk/src/VBox/Main/MediumImpl.cpp (revision 31333) @@ -3867,6 +3867,8 @@ // we're accessing parent/child and backrefs, so lock the tree first, then ourselves AutoMultiWriteLock2 multilock(&m->pVirtualBox->getMediaTreeLockHandle(), - this->lockHandle() - COMMA_LOCKVAL_SRC_POS); + this->lockHandle() + COMMA_LOCKVAL_SRC_POS); + + LogFlowFunc(("ENTER for %s\n", getLocationFull().c_str())); bool wasCreated = true; @@ -3886,5 +3888,5 @@ if (m->backRefs.size() != 0) return setError(VBOX_E_OBJECT_IN_USE, - tr("Medium '%s' is attached to %d virtual machines"), + tr("Medium '%s' cannot be closed because it is still attached to %d virtual machines"), m->strLocationFull.raw(), m->backRefs.size()); @@ -3908,4 +3910,6 @@ // of the medium tree cannot be guaranteed. uninit(); + + LogFlowFuncLeave(); return rc; Index: /trunk/src/VBox/Main/ProgressImpl.cpp =================================================================== --- /trunk/src/VBox/Main/ProgressImpl.cpp (revision 31332) +++ /trunk/src/VBox/Main/ProgressImpl.cpp (revision 31333) @@ -1084,4 +1084,6 @@ AssertReturn(mCompleted == FALSE, E_FAIL); + LogFunc(("aResultCode=%d\n", aResultCode)); + if (mCanceled && SUCCEEDED(aResultCode)) aResultCode = E_FAIL; @@ -1105,5 +1107,5 @@ /* wake up all waiting threads */ if (mWaitersCount > 0) - RTSemEventMultiSignal (mCompletedSem); + RTSemEventMultiSignal(mCompletedSem); return rc; Index: /trunk/src/VBox/Main/SnapshotImpl.cpp =================================================================== --- /trunk/src/VBox/Main/SnapshotImpl.cpp (revision 31332) +++ /trunk/src/VBox/Main/SnapshotImpl.cpp (revision 31333) @@ -828,8 +828,12 @@ * Caller must hold the machine write lock (which protects the snapshots tree!) * + * @param writeLock Machine write lock, which can get released temporarily here. + * @param cleanupMode Cleanup mode; see Machine::detachAllMedia(). + * @param llMedia List of media returned to caller, depending on cleanupMode. * @param llFilenames * @return */ HRESULT Snapshot::uninitRecursively(AutoWriteLock &writeLock, + CleanupMode_T cleanupMode, MediaList &llMedia, std::list &llFilenames) @@ -858,5 +862,5 @@ { Snapshot *pChild = *it; - rc = pChild->uninitRecursively(writeLock, llMedia, llFilenames); + rc = pChild->uninitRecursively(writeLock, cleanupMode, llMedia, llFilenames); if (FAILED(rc)) return rc; @@ -866,4 +870,5 @@ rc = m->pMachine->detachAllMedia(writeLock, this /* pSnapshot */, + cleanupMode, llMedia); if (FAILED(rc)) Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 31332) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 31333) @@ -2784,5 +2784,5 @@ - + Progress object to track the operation completion. @@ -2824,5 +2824,5 @@ - + Progress object to track the operation completion. @@ -3222,5 +3222,5 @@ to signal the completion of the progress object. - + @@ -3636,7 +3636,25 @@ + + Cleanup mode, used with . + + + Unregister only the machine, but neither delete snapshots nor detach media. + + + Delete all snapshots and detach all media but return none; this will keep all media registered. + + + Delete all snapshots, detach all media and return hard disks for closing, but not removeable media. + + + Delete all snapshots, detach all media and return all media for closing. + + + @@ -3839,5 +3857,5 @@ Priority of the virtual CPUs. Means to limit the number of CPU cycles a guest can use. The unit is percentage of host CPU cycles per second. - The valid range is 1 - 100. 100 (the default) implies no limit. + The valid range is 1 - 100. 100 (the default) implies no limit. @@ -5186,22 +5204,37 @@ Unregisters the machine, which must have been previously registered using - . - - This method will succeed even if the machine currently has media attachments or - is in the Saved state. In those cases, - the caller receives the names of all files that have been made obsolete by the - call in the @a aFiles array parameter. This list will consist of the saved - state file and all storage files by media that were detached from the machine. - - - The @a fAutoCleanup parameter is temporary to avoid substantial changes to the - frontends in SVN trunk.It will go away before the 3.3 release and - always be true then. If fAutoCleanup is false, the API currently behaves like - the old VirtualBox::UnregisterMachine API. Cleaning up snapshots does not work - yet, so the method will still fail if the machine has snapshots. - - - The settings XML file of the machine object itself will not be included in that - list; call for that. + , and optionally do additional + cleanup before the machine is unregistered. + + This method does not delete any files. It only changes the machine configuration and + the list of registered machines in the VirtualBox object. To delete the files which + belonged to the machine, including the XML file of the machine itself, call + , optionally with the array of IMedium objects that have been + returned from this method. + + Depending on the @a cleanupMode argument, the thoroughness with with this + method cleans up the machine configuration before unregistering the machine + will vary. + +
    +
  • With "UnregisterOnly", the machine will only be unregistered, but no additional + cleanup will be performed. The call will fail if the machine is in "Saved" state + or has any snapshots or any media attached (see . + It is the responsibility of the caller to delete all such configuration in this mode. + In this mode, the API behaves like the former @c IVirtualBox::unregisterMachine() API + which it replaces.
    • +
  • With "DetachAllReturnNone", the call will succeed even if the machine is in "Saved" + state or if it has snapshots or media attached. All media attached to the current machine + state or in snapshots will be detached. No medium objects will be closed or returned; all + of the machine's media will remain opened.
    • +
  • With "DetachAllReturnHardDisksOnly", the call will behave like with "DetachAllReturnNone", + except that all the hard disk medium objects which were detached from the machine will + be returned as an array. This allows for quickly passing them to the + API for closing and deletion.
    • +
  • With "Full", the call will behave like with "DetachAllReturnHardDisksOnly", except + that all media will be returned in the array, including removeable media like DVDs and + floppies. This might be useful if the user wants to inspect in detail which media were + attached to the machine.
    • +
The call will fail if the machine is currently locked (see ). @@ -5209,6 +5242,6 @@ before unregistering it. - After successful method invocation, - the event is fired. + After successful method invocation, the event + is fired. @@ -5220,22 +5253,13 @@ - Machine has snapshot or is locked. - - - - - If true, the method will automatically detach all media from the - machine and its snapshots, call on each - medium, and the paths of all media files involved will be reported to - the caller in the @a aFiles array so the caller can then delete the - image files. - If false, the method will fail if media attachments are present. - - - - - List of all files detached from medium attachments of the machine, if - @a fCloseMedia is true. - + Machine is currently locked for a session. + + + + + How to clean up after the machine has been unregistered. + + + List of media detached from the machine, depending on the @a cleanupMode parameter. @@ -5243,45 +5267,63 @@ - Deletes the settings (machine XML) file of this machine from disk. The machine - must not be registered in order for this operation to succeed. + Deletes the files associated with this machine from disk. If medium objects are passed + in with the @a aMedia argument, they are closed and their storage files are deleted as well. + For convenience, this array of media files can be the same as the one returned from + a previous call. + + This method must only be called on machines which are either write-locked (i.e. on instances + returned by ) or on unregistered machines (i.e. not yet + registered machines created by or opened by + , or after having called ). + + The following files will be deleted by this method: +
    +
  • If had been previously called with a @a cleanupMode + argument other than "UnregisterOnly", this will delete all saved state files that + the machine had in use; possibly one if the machine was in "Saved" state and one + for each online snapshot that the machine had.
    • +
  • On each medium object passed in the @a aMedia array, this will call + and then attempt to delete the medium's storage + on disk. The close() call will fail if the medium is still in use, e.g. because + it is still attached to a second machine.
    • +
  • Finally, the machine's own XML file will be deleted.
    • +
+ + Since deleting large disk image files can be a time-consuming I/O operation, this + method operates asynchronously and returns an IProgress object to allow the caller + to monitor the progress. There will be one sub-operation for each file that is + being deleted (saved state or medium storage file). + will return @c true after this method successfully returns. - - Calling this method is only valid on instances returned - by and on new machines - created by or - opened by but not - yet registered, or on unregistered machines after calling - . - - - The deleted machine settings file can be restored (saved again) - by calling . - - Cannot delete settings of a registered machine or - machine not mutable. + Machine is registered but not write-locked. Could not delete the settings file. - - + + + List of media to be closed and whose storage files will be deleted. + + + Progress object to track the operation completion. + - Exports the machine to an OVF appliance. See for the - steps required to export VirtualBox machines to OVF. - - - - Appliance to export this machine to. - - - VirtualSystemDescription object which is created for this machine. - + Exports the machine to an OVF appliance. See for the + steps required to export VirtualBox machines to OVF. + + + + Appliance to export this machine to. + + + VirtualSystemDescription object which is created for this machine. + Index: /trunk/src/VBox/Main/include/MachineImpl.h =================================================================== --- /trunk/src/VBox/Main/include/MachineImpl.h (revision 31332) +++ /trunk/src/VBox/Main/include/MachineImpl.h (revision 31333) @@ -181,4 +181,7 @@ ComObjPtr mFirstSnapshot; ComObjPtr mCurrentSnapshot; + + // list of files to delete in Delete(); this list is filled by Unregister() + std::list llFilesToDelete; }; @@ -484,6 +487,6 @@ STDMETHOD(SaveSettings)(); STDMETHOD(DiscardSettings)(); - STDMETHOD(Unregister) (BOOL fAutoCleanup, ComSafeArrayOut(BSTR, aFiles)); - STDMETHOD(Delete)(); + STDMETHOD(Unregister)(CleanupMode_T cleanupMode, ComSafeArrayOut(IMedium*, aMedia)); + STDMETHOD(Delete)(ComSafeArrayIn(IMedium*, aMedia), IProgress **aProgress); STDMETHOD(Export)(IAppliance *aAppliance, IVirtualSystemDescription **aDescription); STDMETHOD(GetSnapshot)(IN_BSTR aId, ISnapshot **aSnapshot); @@ -782,4 +785,5 @@ HRESULT detachAllMedia(AutoWriteLock &writeLock, Snapshot *pSnapshot, + CleanupMode_T cleanupMode, MediaList &llMedia); @@ -792,4 +796,8 @@ void commit(); void copyFrom(Machine *aThat); + + struct DeleteTask; + static DECLCALLBACK(int) deleteThread(RTTHREAD Thread, void *pvUser); + HRESULT deleteTaskWorker(DeleteTask &task); #ifdef VBOX_WITH_GUEST_PROPS Index: /trunk/src/VBox/Main/include/SnapshotImpl.h =================================================================== --- /trunk/src/VBox/Main/include/SnapshotImpl.h (revision 31332) +++ /trunk/src/VBox/Main/include/SnapshotImpl.h (revision 31333) @@ -125,4 +125,5 @@ HRESULT uninitRecursively(AutoWriteLock &writeLock, + CleanupMode_T cleanupMode, MediaList &llMedia, std::list &llFilenames); Index: /trunk/src/VBox/Main/testcase/tstOVF.cpp =================================================================== --- /trunk/src/VBox/Main/testcase/tstOVF.cpp (revision 31332) +++ /trunk/src/VBox/Main/testcase/tstOVF.cpp (revision 31333) @@ -349,19 +349,14 @@ RTPrintf(" Deleting machine %ls...\n", bstrUUID.raw()); - SafeArray sfaFiles; - rc = pMachine->Unregister(true /* fDetachMedia */, - ComSafeArrayAsOutParam(sfaFiles)); + SafeIfaceArray sfaMedia; + rc = pMachine->Unregister(CleanupMode_DetachAllReturnHardDisksOnly, + ComSafeArrayAsOutParam(sfaMedia)); if (FAILED(rc)) throw MyError(rc, "Machine::Unregister() failed\n"); - for (size_t u = 0; - u < sfaFiles.size(); - ++u) - { - RTPrintf(" UnregisterMachine reported disk image %ls\n", sfaFiles[u]); - llFiles2Delete.push_back(sfaFiles[u]); - } - - rc = pMachine->Delete(); + ComPtr pProgress; + rc = pMachine->Delete(ComSafeArrayAsInParam(sfaMedia), pProgress.asOutParam()); if (FAILED(rc)) throw MyError(rc, "Machine::DeleteSettings() failed\n"); + rc = pProgress->WaitForCompletion(-1); + if (FAILED(rc)) throw MyError(rc, "Progress::WaitForCompletion() failed\n"); } } Index: /trunk/src/VBox/Main/webservice/websrv-cpp.xsl =================================================================== --- /trunk/src/VBox/Main/webservice/websrv-cpp.xsl (revision 31332) +++ /trunk/src/VBox/Main/webservice/websrv-cpp.xsl (revision 31333) @@ -568,4 +568,13 @@ + + + + + + + break; + +