Changeset 24494 in vbox for trunk/src/VBox

Timestamp:

Nov 9, 2009 12:12:28 PM (15 years ago)

Author:

vboxsync

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

54579

Message:

Main/Appliance: fix SCSI controller import (use long name now), and make sure that the right name gets used in the config file depending on the version.

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (5 diffs)
• xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1715 +1715 @@
 
                             case HardDiskController::SATA:
-                                mhda.controllerType = Bstr("SATA");
+                                mhda.controllerType = Bstr("SATA Controller");
                                 mhda.lChannel = (long)vd.ulAddressOnParent;
                                 mhda.lDevice = (long)0;
@@ -1721 +1721 @@
 
                             case HardDiskController::SCSI:
-                                mhda.controllerType = Bstr("SCSI");
+                                mhda.controllerType = Bstr("SCSI Controller");
                                 mhda.lChannel = (long)vd.ulAddressOnParent;
                                 mhda.lDevice = (long)0;
@@ -2864 +2864 @@
                 // it'll stick in the registry forever
                 pTargetDisk->Close();
-                throw;
+                throw rc3;
             }
             diskList.push_back(strTargetFilePath);
@@ -4398 +4398 @@
 #ifdef VBOX_WITH_AHCI
 //     <const name="HardDiskControllerSATA" value="7" />
-        rc = GetStorageControllerByName(Bstr("SATA"), pController.asOutParam());
+        rc = GetStorageControllerByName(Bstr("SATA Controller"), pController.asOutParam());
         if (SUCCEEDED(rc))
         {
@@ -4412 +4412 @@
 #ifdef VBOX_WITH_LSILOGIC
 //     <const name="HardDiskControllerSCSI" value="8" />
-        rc = GetStorageControllerByName(Bstr("SCSI"), pController.asOutParam());
+        rc = GetStorageControllerByName(Bstr("SCSI Controller"), pController.asOutParam());
         if (SUCCEEDED(rc))
         {

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1945 +1945 @@
             else if (sctl.strName == "SATA")
                 sctl.strName = "SATA Controller";
+            else if (sctl.strName == "SCSI")
+                sctl.strName = "SCSI Controller";
         }
 
@@ -2822 +2824 @@
             else if (name == "SATA Controller")
                 name = "SATA";
+            else if (name == "SCSI Controller")
+                name = "SCSI";
         }
         pelmController->setAttribute("name", sc.strName);