Changeset 21130 in vbox for trunk

Timestamp:

Jul 1, 2009 2:53:57 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Changed max values for the guest memory/VCPUs based on the host.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMSettingsSystem.cpp (modified) (5 diffs)

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

@@ -24 +24 @@
 #include "VBoxVMSettingsSystem.h"
 
+#include <iprt/cdefs.h>
+
 #define ITEM_TYPE_ROLE Qt::UserRole + 1
 
@@ -53 +55 @@
     /* Setup constants */
     CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
-    const uint MinRAM = sys.GetMinGuestRAM();
-    const uint MaxRAM = sys.GetMaxGuestRAM();
-    const uint MinCPU = sys.GetMinGuestCPUCount();
-    const uint MaxCPU = sys.GetMaxGuestCPUCount();
+    mMinGuestRAM = sys.GetMinGuestRAM();
+    mMaxGuestRAM = RT_MIN (RT_ALIGN (vboxGlobal().virtualBox().GetHost().GetMemorySize(), _1G / _1M), sys.GetMaxGuestRAM());
+    mMinGuestCPU = sys.GetMinGuestCPUCount();
+    mMaxGuestCPU = RT_MIN (2 * vboxGlobal().virtualBox().GetHost().GetProcessorCount(), sys.GetMaxGuestCPUCount());
 
     /* Setup validators */
-    mLeMemory->setValidator (new QIntValidator (MinRAM, MaxRAM, this));
-    mLeCPU->setValidator (new QIntValidator (MinCPU, MaxCPU, this));
+    mLeMemory->setValidator (new QIntValidator (mMinGuestRAM, mMaxGuestRAM, this));
+    mLeCPU->setValidator (new QIntValidator (mMinGuestCPU, mMaxGuestCPU, this));
 
     /* Setup connections */
@@ -95 +97 @@
 
     /* Setup memory slider */
-    mSlMemory->setPageStep (calcPageStep (MaxRAM));
+    mSlMemory->setPageStep (calcPageStep (mMaxGuestRAM));
     mSlMemory->setSingleStep (mSlMemory->pageStep() / 4);
     mSlMemory->setTickInterval (mSlMemory->pageStep());
     /* Setup the scale so that ticks are at page step boundaries */
-    mSlMemory->setMinimum ((MinRAM / mSlMemory->pageStep()) * mSlMemory->pageStep());
-    mSlMemory->setMaximum (MaxRAM);
+    mSlMemory->setMinimum ((mMinGuestRAM / mSlMemory->pageStep()) * mSlMemory->pageStep());
+    mSlMemory->setMaximum (mMaxGuestRAM);
     /* Limit min/max. size of QLineEdit */
     mLeMemory->setFixedWidthByText (QString().fill ('8', 5));
@@ -111 +113 @@
     mSlCPU->setTickInterval (1);
     /* Setup the scale so that ticks are at page step boundaries */
-    mSlCPU->setMinimum (MinCPU);
-    mSlCPU->setMaximum (MaxCPU);
+    mSlCPU->setMinimum (mMinGuestCPU);
+    mSlCPU->setMaximum (mMaxGuestCPU);
     /* Limit min/max. size of QLineEdit */
     mLeCPU->setFixedWidthByText (QString().fill ('8', 3));
@@ -455 +457 @@
 
     /* Retranslate the memory slider legend */
-    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (sys.GetMinGuestRAM()));
-    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (sys.GetMaxGuestRAM()));
+    mLbMemoryMin->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (mMinGuestRAM));
+    mLbMemoryMax->setText (tr ("<qt>%1&nbsp;MB</qt>").arg (mMaxGuestRAM));
 
     /* Retranslate the cpu slider legend */
-    mLbCPUMin->setText (tr ("<qt>%1&nbsp;CPU</qt>", "%1 is 1 for now").arg (sys.GetMinGuestCPUCount()));
-    mLbCPUMax->setText (tr ("<qt>%1&nbsp;CPUs</qt>", "%1 is 32 for now").arg (sys.GetMaxGuestCPUCount()));
+    mLbCPUMin->setText (tr ("<qt>%1&nbsp;CPU</qt>", "%1 is 1 for now").arg (mMinGuestCPU));
+    mLbCPUMax->setText (tr ("<qt>%1&nbsp;CPUs</qt>", "%1 is host cpu count * 2 for now").arg (mMaxGuestCPU));
 }