Changeset 18015 in vbox

Timestamp:

Mar 17, 2009 12:17:09 PM (16 years ago)

Author:

vboxsync

Message:

OVF: upper-case OVF constants for consistency.

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (8 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -854 +854 @@
                     break;
 
-                    case OVFResourceType_IdeController:          // 5       IdeController
+                    case OVFResourceType_IDEController:          // 5
                     {
                         /*  <Item>
@@ -874 +874 @@
                     break;
 
-                    case OVFResourceType_ParallelScsiHba:        // 6       SCSI controller
+                    case OVFResourceType_ParallelSCSIHBA:        // 6       SCSI controller
                     {
                         /*  <Item>
@@ -923 +923 @@
                     break;
 
-                    case OVFResourceType_CdDrive:       // 15
+                    case OVFResourceType_CDDrive:       // 15
                         /*  <Item ovf:required="false">
                                 <rasd:Caption>cdrom1</rasd:Caption>
@@ -1016 +1016 @@
                     break;
 
-                    case OVFResourceType_UsbController: // 23
+                    case OVFResourceType_USBController: // 23
                         /*  <Item ovf:required="false">
                                 <rasd:Caption>usb</rasd:Caption>
@@ -2747 +2747 @@
                             {
                                 strDescription = "IDE Controller";
-                                type = OVFResourceType_IdeController; // 5
+                                type = OVFResourceType_IDEController; // 5
                                 // it seems that OVFTool always writes these two, and since we can only
                                 // have one IDE controller, we'll use this as well
@@ -2809 +2809 @@
                                 strDescription = "SCSI Controller";
                                 strCaption = "scsiController0";
-                                type = OVFResourceType_ParallelScsiHba; // 6
+                                type = OVFResourceType_ParallelSCSIHBA; // 6
                                 // it seems that OVFTool always writes these two, and since we can only
                                 // have one SATA controller, we'll use this as well
@@ -2899 +2899 @@
                                 strDescription = "CD-ROM Drive";
                                 strCaption = "cdrom1";          // this is what OVFTool writes
-                                type = OVFResourceType_CdDrive; // 15
+                                type = OVFResourceType_CDDrive; // 15
                                 lAutomaticAllocation = 1;
                                 ulParent = idIDEController;
@@ -2952 +2952 @@
                                 strDescription = "USB Controller";
                                 strCaption = "usb";
-                                type = OVFResourceType_UsbController; // 23
+                                type = OVFResourceType_USBController; // 23
                                 lAddress = 0;                   // this is what OVFTool writes
                                 lBusNumber = 0;                 // this is what OVFTool writes

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

@@ -2959 +2959 @@
     <const name="Processor" value="3" />
     <const name="Memory" value="4" />
-    <const name="IdeController" value="5" />
-    <const name="ParallelScsiHba" value="6" />
-    <const name="FcHba" value="7" />
-    <const name="iScsiHba" value="8" />
-    <const name="IbHca" value="9" />
+    <const name="IDEController" value="5" />
+    <const name="ParallelSCSIHBA" value="6" />
+    <const name="FCHBA" value="7" />
+    <const name="iSCSIHBA" value="8" />
+    <const name="IBHCA" value="9" />
     <const name="EthernetAdapter" value="10" />
     <const name="OtherNetworkAdapter" value="11" />
-    <const name="IoSlot" value="12" />
-    <const name="IoDevice" value="13" />
+    <const name="IOSlot" value="12" />
+    <const name="IODevice" value="13" />
     <const name="FloppyDrive" value="14" />
-    <const name="CdDrive" value="15" />
-    <const name="DvdDrive" value="16" />
+    <const name="CDDrive" value="15" />
+    <const name="DVDDrive" value="16" />
     <const name="HardDisk" value="17" />
     <const name="OtherStorageDevice" value="20" />
-    <const name="UsbController" value="23" />
+    <const name="USBController" value="23" />
     <const name="SoundCard" value="35" />
   </enum>