Changeset 92032 in vbox for trunk

Timestamp:

Oct 25, 2021 1:25:10 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Trying to improve cleanup stuff wen vm creatin fails.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (4 diffs)
• UIWizardNewVM.h (modified) (2 diffs)
• UIWizardNewVMExpertPage.cpp (modified) (1 diff)
• UIWizardNewVMSummaryPage.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -132 +132 @@
                                        m_strMachineBaseName,
                                        groups, strTypeId, QString());
+        /* Try to delete the hard disk: */
+        deleteVirtualDisk();
+
         if (!vbox.isOk())
         {
@@ -164 +167 @@
     if (!vbox.isOk())
     {
+        /* Try to delete the hard disk: */
+        deleteVirtualDisk();
         msgCenter().cannotRegisterMachine(vbox, m_machine.GetName(), this);
         return false;
@@ -441 +446 @@
         CVirtualBox vbox = uiCommon().virtualBox();
         /* Unregister on failure */
-        QVector<CMedium> aMedia = m_machine.Unregister(KCleanupMode_UnregisterOnly);   /// @todo replace with DetachAllReturnHardDisksOnly once a progress dialog is in place below
+        QVector<CMedium> aMedia = m_machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
         if (vbox.isOk())
         {
@@ -447 +452 @@
             progress.WaitForCompletion(-1);         /// @todo do this nicely with a progress dialog, this can delete lots of files
         }
-        return false;
-    }
-
-    /* Ensure we don't try to delete a newly created virtual hard drive on success: */
+    }
+
+    /* Make sure we detach CMedium wrapper from IMedium pointer to avoid deletion of IMedium as m_virtualDisk is deallocated: */
+    /* Or in case of IMachine::DeleteConfig IMedium has been already deleted so detach in this case as well:*/
     if (!m_virtualDisk.isNull())
         m_virtualDisk.detach();
 
-    return true;
+    return success;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -79 +79 @@
     bool createVM();
     bool createVirtualDisk();
-    void deleteVirtualDisk();
 
     CMedium &virtualDisk();
@@ -189 +188 @@
     /** Returns the Id of newly created VM. */
     QUuid createdMachineId() const;
+    void deleteVirtualDisk();
 
     /** @name Variables

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

@@ -640 +640 @@
     }
 
-    fResult = pWizard->createVM();
-    /* Try to delete the hard disk: */
-    if (!fResult)
-        pWizard->deleteVirtualDisk();
-
-    return fResult;
+    return pWizard->createVM();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMSummaryPage.cpp

@@ -509 +509 @@
     }
 
-    fResult = pWizard->createVM();
-    /* Try to delete the hard disk: */
-    if (!fResult)
-        pWizard->deleteVirtualDisk();
-
-    return fResult;
+    return pWizard->createVM();
 }