Changeset 84880 in vbox for trunk

Timestamp:

Jun 19, 2020 12:07:26 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Using the VCPU count while creating the vm.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (3 diffs)
• UIWizardNewVMPageBasic2.cpp (modified) (3 diffs)
• UIWizardNewVMPageBasic2.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -131 +131 @@
     /* The newer and less tested way of configuring vms: */
     m_machine.ApplyDefaults(QString());
-    /* correct the RAM size. IMachine::applyDefaults may have overwritten the user setting: */
+    /* Apply user preferences again. IMachine::applyDefaults may have overwritten the user setting: */
     m_machine.SetMemorySize(field("baseMemory").toUInt());
+    m_machine.SetCPUCount(field("VCPUCount").toUInt());
     /* Correct the VRAM size since API does not take fullscreen memory requirements into account: */
     CGraphicsAdapter comGraphics = m_machine.GetGraphicsAdapter();
@@ -155 +156 @@
     /* RAM size: */
     m_machine.SetMemorySize(field("baseMemory").toInt());
+    /* VCPU count: */
+    m_machine.SetCPUCount(field("VCPUCount").toUInt());
+
 
     /* Graphics Controller type: */
@@ -375 +379 @@
         case WizardMode_Basic:
         {
-            UIWizardNewVMPageBasic1 *pPage1 = qobject_cast<UIWizardNewVMPageBasic1*> (page(Page1));
-            if (pPage1)
-                pPage1->cleanupMachineFolder(true);
+            UIWizardNewVMPageBasic1 *pPage = qobject_cast<UIWizardNewVMPageBasic1*> (page(Page2));
+            /* Make sure that we were able to find the page that created the folder. */
+            Assert(pPage);
+            if (pPage)
+                pPage->cleanupMachineFolder(true);
             break;
         }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp

@@ -47 +47 @@
 }
 
+int UIWizardNewVMPage2::VCPUCount() const
+{
+    if (!m_pVirtualCPUEditor)
+        return 1;
+    return m_pVirtualCPUEditor->value();
+}
+
 UIWizardNewVMPageBasic2::UIWizardNewVMPageBasic2()
     : m_pLabel(0)
@@ -70 +77 @@
     /* Register fields: */
     registerField("baseMemory", this, "baseMemory");
+    registerField("VCPUCount", this, "VCPUCount");
 }
 
@@ -90 +98 @@
     CGuestOSType type = field("type").value<CGuestOSType>();
     m_pBaseMemoryEditor->setValue(type.GetRecommendedRAM());
+    m_pVirtualCPUEditor->setValue(1);
 
     /* 'Ram' field should have focus initially: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.h

@@ -42 +42 @@
 
     int baseMemory() const;
+    int VCPUCount() const;
 
     /* Widgets: */
@@ -53 +54 @@
     Q_OBJECT;
     Q_PROPERTY(int baseMemory READ baseMemory);
+    Q_PROPERTY(int VCPUCount READ VCPUCount);
 
 public: