Changeset 17870 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 14, 2009 4:32:44 PM (16 years ago)

Author:

vboxsync

Message:

OVF: export the selected controller type

File:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -3439 +3439 @@
                                Utf8StrFmt("%d", lIDEControllerIndex),
                                strVbox,
-                               "");
+                               strVbox);
         }
 
@@ -3445 +3445 @@
 //     <const name="HardDiskControllerSATA" value="7" />
         rc = GetStorageControllerByName(Bstr("SATA"), pController.asOutParam());
-        strVbox = "AHCI";
         if (SUCCEEDED(rc))
         {
+            strVbox = "AHCI";
             lSATAControllerIndex = (int32_t)pNewDesc->m->llDescriptions.size();
             pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSATA,
                                Utf8StrFmt("%d", lSATAControllerIndex),
                                strVbox,
-                               "");
+                               strVbox);
         }
 #endif // VBOX_WITH_AHCI
@@ -3458 +3458 @@
 //     <const name="HardDiskControllerSCSI" value="8" />
         rc = GetStorageControllerByName(Bstr("SCSI"), pController.asOutParam());
-        if (SUCCEEDED (rc))
+        if (SUCCEEDED(rc))
         {
             rc = pController->COMGETTER(ControllerType)(&ctlr);
-            if (FAILED(rc)) throw rc;
-            strVbox = "LsiLogic";       // the default in VBox
-            switch(ctlr)
-            {
-                case StorageControllerType_LsiLogic: strVbox = "LsiLogic"; break;
-                case StorageControllerType_BusLogic: strVbox = "BusLogic"; break;
-            }
             if (SUCCEEDED(rc))
             {
+                strVbox = "LsiLogic";       // the default in VBox
+                switch(ctlr)
+                {
+                    case StorageControllerType_LsiLogic: strVbox = "LsiLogic"; break;
+                    case StorageControllerType_BusLogic: strVbox = "BusLogic"; break;
+                }
                 lSCSIControllerIndex = (int32_t)pNewDesc->m->llDescriptions.size();
                 pNewDesc->addEntry(VirtualSystemDescriptionType_HardDiskControllerSCSI,
                                    Utf8StrFmt("%d", lSCSIControllerIndex),
                                    strVbox,
-                                   "");
+                                   strVbox);
             }
+            else 
+                throw rc;
         }