Changeset 30157 in vbox for trunk/src/VBox/Main/include/ovfreader.h

Timestamp:

Jun 10, 2010 8:11:14 PM (15 years ago)

Author:

vboxsync

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

62580

Message:

OVF: added OS types from CIM 2.25.0, including Windows 7 and Oracle; added missing OS type conversions so less VMs end up as 'other' on export

File:

• trunk/src/VBox/Main/include/ovfreader.h (modified) (3 diffs)

trunk/src/VBox/Main/include/ovfreader.h

@@ -34 +34 @@
 
 enum CIMOSType_T
-{   CIMOSType_CIMOS_Unknown = 0,
+{
+    CIMOSType_CIMOS_Unknown = 0,
     CIMOSType_CIMOS_Other   = 1,
     CIMOSType_CIMOS_MACOS   = 2,
@@ -136 +137 @@
     CIMOSType_CIMOS_Linux_2_6_x_64  = 100,
     CIMOSType_CIMOS_Linux_64    = 101,
-    CIMOSType_CIMOS_Other_64    = 102
+    CIMOSType_CIMOS_Other_64    = 102,
+    // types added with CIM 2.25.0 follow:
+    CIMOSType_CIMOS_WindowsServer2008R2 = 103,
+    CIMOSType_CIMOS_VMwareESXi = 104,
+    CIMOSType_CIMOS_Windows7 = 105,
+    CIMOSType_CIMOS_CentOS = 106,
+    CIMOSType_CIMOS_CentOS_64 = 107,
+    CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
+    CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
+    CIMOSType_CIMOS_eComStation = 110
 };
 
@@ -216 +226 @@
                                         // listed in the NetworkSection at the outermost envelope level." We ignore this and only set up
                                         // a network adapter depending on the network name.
-    iprt::MiniString strAddress;                 // "Device-specific. For an Ethernet adapter, this specifies the MAC address."
+    iprt::MiniString strAddress;        // "Device-specific. For an Ethernet adapter, this specifies the MAC address."
     int32_t lAddress;                   // strAddress as an integer, if applicable.
     iprt::MiniString strAddressOnParent;         // "For a device, this specifies its location on the controller."