Changeset 34501 in vbox for trunk/src

Timestamp:

Nov 30, 2010 12:30:30 PM (14 years ago)

Author:

vboxsync

Message:

Main/OVF: use ostype from ovf:/OperatingSystemSection/vbox:OSType element if present (reading only so far)

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplImport.cpp (modified) (8 diffs)
• include/ovfreader.h (modified) (2 diffs)
• xml/ovfreader.cpp (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -163 +163 @@
                 pNewDesc->importVboxMachineXML(*vsysThis.pelmVboxMachine);
 
-            /* Guest OS type */
+            // Guest OS type
+            // This is taken from one of three places, in this order:
             Utf8Str strOsTypeVBox;
-            Utf8Str strCIMOSType = Utf8StrFmt("%RU32", (uint32_t)vsysThis.cimos);
-            /* If there is a vbox.xml, we always prefer the ostype settings
-             * from there, cause OVF doesn't know all types VBox know. */
+            Utf8StrFmt strCIMOSType("%RU32", (uint32_t)vsysThis.cimos);
+            // 1) If there is a <vbox:Machine>, then use the type from there.
             if (   vsysThis.pelmVboxMachine
-                && pNewDesc->m->pConfig->machineUserData.strOsType.isNotEmpty())
+                && pNewDesc->m->pConfig->machineUserData.strOsType.isNotEmpty()
+               )
                 strOsTypeVBox = pNewDesc->m->pConfig->machineUserData.strOsType;
+            // 2) Otherwise, if there is OperatingSystemSection/vbox:OSType, use that one.
+            else if (vsysThis.strTypeVbox.isNotEmpty())      // OVFReader has found vbox:OSType
+                strOsTypeVBox = vsysThis.strTypeVbox;
+            // 3) Otherwise, make a best guess what the vbox type is from the OVF (CIM) OS type.
             else
                 convertCIMOSType2VBoxOSType(strOsTypeVBox, vsysThis.cimos, vsysThis.strCimosDesc);
@@ -180 +185 @@
             /* VM name */
             Utf8Str nameVBox;
-            /* If there is a vbox.xml, we always prefer the setting from there. */
+            /* If there is a <vbox:Machine>, we always prefer the setting from there. */
             if (   vsysThis.pelmVboxMachine
                 && pNewDesc->m->pConfig->machineUserData.strName.isNotEmpty())
@@ -261 +266 @@
             /* CPU count */
             ULONG cpuCountVBox;
-            /* If there is a vbox.xml, we always prefer the setting from there. */
+            /* If there is a <vbox:Machine>, we always prefer the setting from there. */
             if (   vsysThis.pelmVboxMachine
                 && pNewDesc->m->pConfig->hardwareMachine.cCPUs)
@@ -283 +288 @@
             /* RAM */
             uint64_t ullMemSizeVBox;
-            /* If there is a vbox.xml, we always prefer the setting from there. */
+            /* If there is a <vbox:Machine>, we always prefer the setting from there. */
             if (   vsysThis.pelmVboxMachine
                 && pNewDesc->m->pConfig->hardwareMachine.ulMemorySizeMB)
@@ -317 +322 @@
             Utf8Str strSoundCard;
             Utf8Str strSoundCardOrig;
-            /* If there is a vbox.xml, we always prefer the setting from there. */
+            /* If there is a <vbox:Machine>, we always prefer the setting from there. */
             if (   vsysThis.pelmVboxMachine
                 && pNewDesc->m->pConfig->hardwareMachine.audioAdapter.fEnabled)
@@ -336 +341 @@
 #ifdef VBOX_WITH_USB
             /* USB Controller */
-            /* If there is a vbox.xml, we always prefer the setting from there. */
+            /* If there is a <vbox:Machine>, we always prefer the setting from there. */
             if (   (   vsysThis.pelmVboxMachine
                     && pNewDesc->m->pConfig->hardwareMachine.usbController.fEnabled)
@@ -344 +349 @@
 
             /* Network Controller */
-            /* If there is a vbox.xml, we always prefer the setting from there. */
+            /* If there is a <vbox:Machine>, we always prefer the setting from there. */
             if (vsysThis.pelmVboxMachine)
             {
@@ -448 +453 @@
             }
 
-            /* If there is a vbox.xml, we always prefer the setting from there. */
+            /* If there is a <vbox:Machine>, we always prefer the setting from there. */
             bool fFloppy = false;
             bool fDVD = false;

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

@@ -325 +325 @@
     CIMOSType_T         cimos;
     iprt::MiniString    strCimosDesc;           // readable description of the cimos type in the case of cimos = 0/1/102
+    iprt::MiniString    strTypeVbox;            // optional type from @vbox:ostype attribute (VirtualBox 4.0 or higher)
+
     iprt::MiniString    strVirtualSystemType;   // generic hardware description; OVF says this can be something like "vmx-4" or "xen";
                                                 // VMware Workstation 6.5 is "vmx-07"
@@ -361 +363 @@
 
     VirtualSystem()
-        : ullMemorySize(0),
+        : cimos(CIMOSType_CIMOS_Unknown),
+          ullMemorySize(0),
           cCPUs(1),
           fHasFloppyDrive(false),

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

@@ -775 +775 @@
             if ((pelmCIMOSDescription = pelmThis->findChildElement("Description")))
                 vsys.strCimosDesc = pelmCIMOSDescription->getValue();
+
+            const xml::ElementNode *pelmVBoxOSType;
+            if ((pelmVBoxOSType = pelmThis->findChildElement("vbox",            // namespace
+                                                             "OSType")))        // element name
+                vsys.strTypeVbox = pelmVBoxOSType->getValue();
         }
         else if (    (!strcmp(pcszElemName, "AnnotationSection"))