Changeset 29405 in vbox for trunk

Timestamp:

May 12, 2010 10:20:34 AM (15 years ago)

Author:

vboxsync

Message:

Main/FE/Qt4: prepare for correct SAS handling in the Appliance import/export

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/widgets/VBoxApplianceEditorWgt.cpp (modified) (4 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxApplianceEditorWgt.cpp

@@ -189 +189 @@
                         case KVirtualSystemDescriptionType_HardDiskControllerSATA: v = VBoxApplianceEditorWgt::tr ("Hard Disk Controller (SATA)"); break;
                         case KVirtualSystemDescriptionType_HardDiskControllerSCSI: v = VBoxApplianceEditorWgt::tr ("Hard Disk Controller (SCSI)"); break;
+                        case KVirtualSystemDescriptionType_HardDiskControllerSAS: v = VBoxApplianceEditorWgt::tr ("Hard Disk Controller (SAS)"); break;
                         case KVirtualSystemDescriptionType_CDROM: v = VBoxApplianceEditorWgt::tr ("DVD"); break;
                         case KVirtualSystemDescriptionType_Floppy: v = VBoxApplianceEditorWgt::tr ("Floppy"); break;
@@ -253 +254 @@
                         case KVirtualSystemDescriptionType_HardDiskControllerSATA: v = QIcon (":/sata_16px.png"); break;
                         case KVirtualSystemDescriptionType_HardDiskControllerSCSI: v = QIcon (":/scsi_16px.png"); break;
+                        case KVirtualSystemDescriptionType_HardDiskControllerSAS: v = QIcon (":/scsi_16px.png"); break;
                         case KVirtualSystemDescriptionType_HardDiskImage: v = QIcon (":/hd_16px.png"); break;
                         case KVirtualSystemDescriptionType_CDROM: v = QIcon (":/cd_16px.png"); break;
@@ -667 +669 @@
                 if (types[i] == KVirtualSystemDescriptionType_HardDiskControllerIDE ||
                     types[i] == KVirtualSystemDescriptionType_HardDiskControllerSATA ||
-                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSCSI)
+                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSCSI ||
+                    types[i] == KVirtualSystemDescriptionType_HardDiskControllerSAS)
                     controllerMap[i] = hi;
             }
@@ -940 +943 @@
     KVirtualSystemDescriptionType_HardDiskControllerIDE,
     KVirtualSystemDescriptionType_HardDiskControllerSATA,
-    KVirtualSystemDescriptionType_HardDiskControllerSCSI
+    KVirtualSystemDescriptionType_HardDiskControllerSCSI,
+    KVirtualSystemDescriptionType_HardDiskControllerSAS
 };
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3464 +3464 @@
   <enum
     name="VirtualSystemDescriptionType"
-    uuid="aacc58de-5b45-4f82-ae2e-dd9a824fc3b5"
+    uuid="c0f8f135-3a1d-417d-afa6-b38b95a91f90"
   >
     <desc>Used with <link to="IVirtualSystemDescription" /> to describe the type of
@@ -3485 +3485 @@
     <const name="HardDiskControllerSATA" value="15" />
     <const name="HardDiskControllerSCSI" value="16" />
-    <const name="HardDiskImage" value="17" />
-    <const name="Floppy" value="18" />
-    <const name="CDROM" value="19" />
-    <const name="NetworkAdapter" value="20" />
-    <const name="USBController" value="21" />
-    <const name="SoundCard" value="22" />
+    <const name="HardDiskControllerSAS" value="17" />
+    <const name="HardDiskImage" value="18" />
+    <const name="Floppy" value="19" />
+    <const name="CDROM" value="20" />
+    <const name="NetworkAdapter" value="21" />
+    <const name="USBController" value="22" />
+    <const name="SoundCard" value="23" />
 
   </enum>