Changeset 20259 in vbox

Timestamp:

Jun 4, 2009 10:09:05 AM (16 years ago)

Author:

vboxsync

Message:

OVF: import/export CPU count

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxApplianceEditorWgt.cpp (modified) (1 diff)
• Main/ApplianceImpl.cpp (modified) (3 diffs)

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

@@ -332 +332 @@
              mType == KVirtualSystemDescriptionType_License ||
              mType == KVirtualSystemDescriptionType_OS ||
+             mType == KVirtualSystemDescriptionType_CPU ||
              mType == KVirtualSystemDescriptionType_Memory ||
              mType == KVirtualSystemDescriptionType_SoundCard ||

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1935 +1935 @@
             }
 
-            /* CPU count (ignored for now) */
-            // EntriesList vsdeCPU = vsd->findByType (VirtualSystemDescriptionType_CPU);
+            /* CPU count */
+            std::list<VirtualSystemDescriptionEntry*> vsdeCPU = vsdescThis->findByType (VirtualSystemDescriptionType_CPU);
+            const Utf8Str &cpuVBox = vsdeCPU.front()->strVbox;
+            ULONG tmpCount = (ULONG)RTStrToUInt64(cpuVBox.c_str());
+            rc = pNewMachine->COMSETTER(CPUCount)(tmpCount);
+            if (FAILED(rc)) throw rc;
+            bool fEnableIOApic = false;
+            /* We need HWVirt & IO-APIC if more than one CPU is requested */
+            if (tmpCount > 1)
+            {
+                rc = pNewMachine->COMSETTER(HWVirtExEnabled)(TRUE);
+                if (FAILED(rc)) throw rc;
+
+                fEnableIOApic = true;
+            }
 
             /* RAM */
@@ -1966 +1979 @@
             Utf8Str strFamilyId(bstrFamilyId);
             if (strFamilyId == "Windows")
+                fEnableIOApic = true;
+
+            /* If IP-APIC should be enabled could be have different reasons.
+               See CPU count & the Win test above. Here we enable it if it was
+               previously requested. */
+            if (fEnableIOApic)
             {
                 ComPtr<IBIOSSettings> pBIOSSettings;
@@ -3116 +3135 @@
                                 strDescription = "Number of virtual CPUs";
                                 type = OVFResourceType_Processor; // 3
-                                lVirtualQuantity = 1;
+                                desc.strVbox.toInt(uTemp);
+                                lVirtualQuantity = uTemp;
+                                strCaption = Utf8StrFmt("%d virtual CPU", lVirtualQuantity);     // without this ovftool won't eat the item
                             }
                         break;