Changeset 16302 in vbox

Timestamp:

Jan 28, 2009 12:25:59 PM (16 years ago)

Author:

vboxsync

Message:

OVF: spelling in constants

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -163 +163 @@
 
     CIMOSType_T         cimos;
-    string              strVirtualSystemType;
+    string              strVirtualSystemType;   // generic hardware description; OVF says this can be something like "vmx-4" or "xen";
+                                                // VMware Workstation 6.5 is "vmx-07"
 
     HardwareItemsMap    mapHardwareItems;       // map of virtual hardware items, sorted by unique instance ID
@@ -1186 +1187 @@
                         else if (!RTStrICmp(hdc.strControllerType.c_str(), "PIIX4"))
                             hdcController = IDEControllerType_PIIX4;
-                        vsd->addEntry(VirtualSystemDescriptionType_HarddiskControllerIDE, toString<uint32_t>(hdc.idController), hdc.strControllerType, toString<ULONG>(hdcController));
+                        vsd->addEntry(VirtualSystemDescriptionType_HardDiskControllerIDE, toString<uint32_t>(hdc.idController), hdc.strControllerType, toString<ULONG>(hdcController));
                         break;
                     }
@@ -1194 +1195 @@
                         // @todo: figure out the SATA types
                         /* We only support a plain AHCI controller, so use them always */
-                        vsd->addEntry(VirtualSystemDescriptionType_HarddiskControllerSATA, toString<uint32_t>(hdc.idController), hdc.strControllerType, "AHCI");
+                        vsd->addEntry(VirtualSystemDescriptionType_HardDiskControllerSATA, toString<uint32_t>(hdc.idController), hdc.strControllerType, "AHCI");
                         break;
                     }
@@ -1217 +1218 @@
                             hdcController = "BusLogic";
 # endif /* VBOX_WITH_BUSLOGIC */
-                        vsd->addEntry(VirtualSystemDescriptionType_HarddiskControllerSCSI, toString<uint32_t>(hdc.idController), hdc.strControllerType, hdcController);
+                        vsd->addEntry(VirtualSystemDescriptionType_HardDiskControllerSCSI, toString<uint32_t>(hdc.idController), hdc.strControllerType, hdcController);
                         break;
                     }
@@ -1264 +1265 @@
                     /* Make the path unique to the VBox installation */
                     searchUniqueDiskImageFilePath(path);
-                    vsd->addEntry(VirtualSystemDescriptionType_Harddisk, hd.strDiskId, di.strHref, path);
+                    vsd->addEntry(VirtualSystemDescriptionType_HardDiskImage, hd.strDiskId, di.strHref, path);
                 }
             }
@@ -1396 +1397 @@
 
         /* Hard disk controller IDE */
-        list<VirtualSystemDescriptionEntry> vsdeHDCIDE = vsd->findByType(VirtualSystemDescriptionType_HarddiskControllerIDE);
+        list<VirtualSystemDescriptionEntry> vsdeHDCIDE = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerIDE);
         /* @todo: we support one IDE controller only */
         if (vsdeHDCIDE.size() > 0)
@@ -1411 +1412 @@
 #ifdef VBOX_WITH_AHCI
         /* Hard disk controller SATA */
-        list<VirtualSystemDescriptionEntry> vsdeHDCSATA = vsd->findByType(VirtualSystemDescriptionType_HarddiskControllerSATA);
+        list<VirtualSystemDescriptionEntry> vsdeHDCSATA = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerSATA);
         /* @todo: we support one SATA controller only */
         if (vsdeHDCSATA.size() > 0)
@@ -1433 +1434 @@
 #ifdef VBOX_WITH_SCSI
         /* Hard disk controller SCSI */
-        list<VirtualSystemDescriptionEntry> vsdeHDCSCSI = vsd->findByType(VirtualSystemDescriptionType_HarddiskControllerSCSI);
+        list<VirtualSystemDescriptionEntry> vsdeHDCSCSI = vsd->findByType(VirtualSystemDescriptionType_HardDiskControllerSCSI);
         /* @todo: do we support more than one SCSI controller? */
         if (vsdeHDCSCSI.size() > 0)
@@ -1447 +1448 @@
 
         /* Create the hard disks & connect them to the appropriate controllers. */
-        list<VirtualSystemDescriptionEntry> vsdeHD = vsd->findByType(VirtualSystemDescriptionType_Harddisk);
+        list<VirtualSystemDescriptionEntry> vsdeHD = vsd->findByType(VirtualSystemDescriptionType_HardDiskImage);
         if (vsdeHD.size() > 0)
         {

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

@@ -2992 +2992 @@
     <const name="CPU" value="3" />
     <const name="Memory" value="4" />
-    <const name="HarddiskControllerIDE" value="5" />
-    <const name="HarddiskControllerSATA" value="6" />
-    <const name="HarddiskControllerSCSI" value="7" />
-    <const name="Harddisk" value="8" />
-    <const name="NetworkAdapter" value="9" />
+    <const name="HardDiskControllerIDE" value="5" />
+    <const name="HardDiskControllerSATA" value="6" />
+    <const name="HardDiskControllerSCSI" value="7" />
+    <const name="HardDiskImage" value="8" />
+    <const name="CDROM" value="9" />
+    <const name="Floppy" value="10" />
+    <const name="NetworkAdapter" value="11" />
 
   </enum>