Changeset 25786 in vbox

Timestamp:

Jan 12, 2010 6:01:05 PM (15 years ago)

Author:

vboxsync

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

56544

Message:

Main: fix broken rollback in OVF error handling code (any error in media import would result in incomprehensible error messages saying that a machine could not be registered because it still has hard disk attachments; apparently introduced in april 2009 by the UUID changes -- r46627)

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (12 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -68 +68 @@
 struct Appliance::Data
 {
-        Data()
-          : pReader(NULL) {}
-
-        ~Data()
-        {
-            if (pReader)
-            {
-                delete pReader;
-                pReader = NULL;
-            }
-        }
+    Data()
+      : pReader(NULL) {}
+
+    ~Data()
+    {
+        if (pReader)
+        {
+            delete pReader;
+            pReader = NULL;
+        }
+    }
 
     LocationInfo locInfo; /* The location info for the currently processed OVF */
@@ -757 +757 @@
 struct MyHardDiskAttachment
 {
-    Guid                uuid;
+    Bstr                bstrUuid;
     ComPtr<IMachine>    pMachine;
     Bstr                controllerType;
@@ -1098 +1098 @@
     list<MyHardDiskAttachment> llHardDiskAttachments;
     list< ComPtr<IMedium> > llHardDisksCreated;
-    list<Guid> llMachinesRegistered;
+    list<Bstr> llMachinesRegistered;            // list of string UUIDs
 
     ComPtr<ISession> session;
@@ -1109 +1109 @@
     // if pReader != NULL
 
-    /* If an manifest file exists, verify the content. Therefor we need all
+    /* If an manifest file exists, verify the content. Therefore we need all
      * files which are referenced by the OVF & the OVF itself */
     Utf8Str strMfFile = manifestFileName(pTask->locInfo.strPath);
@@ -1507 +1507 @@
             if (FAILED(rc)) throw rc;
 
-            Bstr newMachineId_;
-            rc = pNewMachine->COMGETTER(Id)(newMachineId_.asOutParam());
+            Bstr bstrNewMachineId;
+            rc = pNewMachine->COMGETTER(Id)(bstrNewMachineId.asOutParam());
             if (FAILED(rc)) throw rc;
-            Guid newMachineId(newMachineId_);
 
             // store new machine for roll-back in case of errors
-            llMachinesRegistered.push_back(newMachineId);
+            llMachinesRegistered.push_back(bstrNewMachineId);
 
             // Add floppies and CD-ROMs to the appropriate controllers.
@@ -1532 +1531 @@
                     /* In order to attach things we need to open a session
                      * for the new machine */
-                    rc = mVirtualBox->OpenSession(session, newMachineId_);
+                    rc = mVirtualBox->OpenSession(session, bstrNewMachineId);
                     if (FAILED(rc)) throw rc;
                     fSessionOpen = true;
@@ -1553 +1552 @@
                         // this is for rollback later
                         MyHardDiskAttachment mhda;
-                        mhda.uuid = newMachineId;
+                        mhda.bstrUuid = bstrNewMachineId;
                         mhda.pMachine = pNewMachine;
                         mhda.controllerType = bstrName;
@@ -1599 +1598 @@
                         // this is for rollback later
                         MyHardDiskAttachment mhda;
-                        mhda.uuid = newMachineId;
+                        mhda.bstrUuid = bstrNewMachineId;
                         mhda.pMachine = pNewMachine;
 
@@ -1650 +1649 @@
                     /* In order to attach hard disks we need to open a session
                      * for the new machine */
-                    rc = mVirtualBox->OpenSession(session, newMachineId_);
+                    rc = mVirtualBox->OpenSession(session, bstrNewMachineId);
                     if (FAILED(rc)) throw rc;
                     fSessionOpen = true;
@@ -1786 +1785 @@
                         // this is for rollback later
                         MyHardDiskAttachment mhda;
-                        mhda.uuid = newMachineId;
+                        mhda.bstrUuid = bstrNewMachineId;
                         mhda.pMachine = pNewMachine;
 
@@ -1851 +1850 @@
         {
             const MyHardDiskAttachment &mhda = *itM;
-            rc2 = mVirtualBox->OpenSession(session, Bstr(mhda.uuid));
+            rc2 = mVirtualBox->OpenSession(session, mhda.bstrUuid);
             if (SUCCEEDED(rc2))
             {
@@ -1878 +1877 @@
 
         // finally, deregister and remove all machines
-        list<Guid>::iterator itID;
+        list<Bstr>::iterator itID;
         for (itID = llMachinesRegistered.begin();
              itID != llMachinesRegistered.end();
              ++itID)
         {
-            const Guid &guid = *itID;
+            const Bstr &bstrGuid = *itID;
             ComPtr<IMachine> failedMachine;
-            rc2 = mVirtualBox->UnregisterMachine(guid.toUtf16(), failedMachine.asOutParam());
+            rc2 = mVirtualBox->UnregisterMachine(bstrGuid, failedMachine.asOutParam());
             if (SUCCEEDED(rc2))
                 rc2 = failedMachine->DeleteSettings();