diff -uNr 1//vbox/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2//vbox/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
--- 1//vbox/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2011-06-11 09:29:07.000000000 -0400
+++ 2//vbox/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2011-06-22 11:25:05.000000000 -0400
@@ -1649,6 +1649,9 @@
+ QString (sSectionItemTpl2).arg (tr ("Processor(s)", "details report"),
tr ("%1", "details report"))
.arg (aMachine.GetCPUCount())
+ + QString (sSectionItemTpl2).arg (tr ("CPU Execution Cap", "details report"),
+ tr ("%1", "details report"))
+ .arg (aMachine.GetCPUExecutionCap())
+ QString (sSectionItemTpl2).arg (tr ("Boot Order", "details report"), bootOrder)
#ifdef VBOX_WITH_FULL_DETAILS_REPORT
+ QString (sSectionItemTpl2).arg (tr ("ACPI", "details report"), acpi)
diff -uNr 1//vbox/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp 2//vbox/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp
--- 1//vbox/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp 2011-06-11 09:28:52.000000000 -0400
+++ 2//vbox/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp 2011-06-22 12:32:40.000000000 -0400
@@ -573,6 +573,10 @@
.arg(VBoxGlobal::tr("VT-x/AMD-V", "details report"), virtualization)
.arg(VBoxGlobal::tr("Nested Paging"), nestedPaging));
+ int cpuCap = console.GetMachine().GetCPUExecutionCap();
+ tip += QApplication::translate("UIIndicatorsPool", "
%1: %2 %", "Virtualization Stuff LED")
+ .arg(VBoxGlobal::tr("CPU Execution Cap", "details report")).arg(cpuCap);
+
int cpuCount = console.GetMachine().GetCPUCount();
if (cpuCount > 1)
tip += QApplication::translate("UIIndicatorsPool", "
%1: %2", "Virtualization Stuff LED")
diff -uNr 1//vbox/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp 2//vbox/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp
--- 1//vbox/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp 2011-06-11 09:28:44.000000000 -0400
+++ 2//vbox/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp 2011-06-22 13:03:45.000000000 -0400
@@ -501,6 +501,12 @@
tr("%1", "details report"))
.arg(cCPU);
+ int cCPUexeccap = m_machine.GetCPUExecutionCap();
+ if (cCPUexeccap < 100)
+ item += sSectionItemTpl2.arg(tr("CPU Cap", "details report"),
+ tr("%1 %", "details report"))
+ .arg(cCPUexeccap);
+
/* Boot order */
QStringList bootOrder;
for (ulong i = 1; i <= m_vbox.GetSystemProperties().GetMaxBootPosition(); ++i)
@@ -715,6 +721,24 @@
}
}
+/**
+ * Return a text summary of the properties of a generic network adapter
+ */
+static QString getGenericProperties(const CNetworkAdapter &adapter) {
+ QVector names;
+ QVector props;
+ props = adapter.GetProperties(QString(), names); // all properties, please
+
+ QString result;
+ for (int i = 0; i < names.size(); i++) {
+ result += names[i] + "=" + props[i];
+ if (i != names.size() - 1)
+ result += ",";
+ }
+
+ return result;
+}
+
void UIDetailsPagePrivate::sltUpdateNetwork()
{
m_secBoxes.value(NetworkSec)->setTitleLinkEnabled(m_fChangeable);
@@ -747,8 +771,8 @@
attType = attType.arg(tr("Host-only adapter, '%1'",
"details report (network)").arg(adapter.GetHostOnlyInterface()));
else if (type == KNetworkAttachmentType_Generic)
- attType = attType.arg(tr("Generic, '%1'",
- "details report (network)").arg(adapter.GetGenericDriver()));
+ attType = attType.arg(tr("Generic bambabies, '%1' { %2 }",
+ "details report (network)").arg(adapter.GetGenericDriver(), getGenericProperties(adapter)));
else
attType = attType.arg(vboxGlobal().toString(type));
diff -uNr 1//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp 2//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp
--- 1//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp 2011-06-11 09:29:03.000000000 -0400
+++ 2//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp 2011-06-22 13:01:43.000000000 -0400
@@ -30,6 +30,7 @@
UIMachineSettingsSystem::UIMachineSettingsSystem()
: mValidator(0)
, mMinGuestCPU(0), mMaxGuestCPU(0)
+ , mMinGuestCPUexeccap(0), mMaxGuestCPUexeccap(0)
, m_fOHCIEnabled(false)
{
/* Apply UI decorations */
@@ -40,6 +41,8 @@
uint hostCPUs = vboxGlobal().virtualBox().GetHost().GetProcessorCount();
mMinGuestCPU = properties.GetMinGuestCPUCount();
mMaxGuestCPU = RT_MIN (2 * hostCPUs, properties.GetMaxGuestCPUCount());
+ mMinGuestCPUexeccap = 1;
+ mMaxGuestCPUexeccap = 100;
/* Populate possible boot items list.
* Currently, it seems, we are supporting only 4 possible boot device types:
@@ -83,6 +86,7 @@
/* Setup validators */
mLeMemory->setValidator (new QIntValidator (mSlMemory->minRAM(), mSlMemory->maxRAM(), this));
mLeCPU->setValidator (new QIntValidator (mMinGuestCPU, mMaxGuestCPU, this));
+ mLeCPUexeccap->setValidator (new QIntValidator (mMinGuestCPUexeccap, mMaxGuestCPUexeccap, this));
/* Setup connections */
connect (mSlMemory, SIGNAL (valueChanged (int)),
@@ -102,6 +106,11 @@
connect (mLeCPU, SIGNAL (textChanged (const QString&)),
this, SLOT (textChangedCPU (const QString&)));
+ connect (mSlCPUexeccap, SIGNAL (valueChanged (int)),
+ this, SLOT (valueChangedCPUexeccap (int)));
+ connect (mLeCPUexeccap, SIGNAL (textChanged (const QString&)),
+ this, SLOT (textChangedCPUexeccap (const QString&)));
+
/* Setup iconsets */
mTbBootItemUp->setIcon(UIIconPool::iconSet(":/list_moveup_16px.png",
":/list_moveup_disabled_16px.png"));
@@ -129,9 +138,24 @@
mSlCPU->setOptimalHint (1, hostCPUs);
mSlCPU->setWarningHint (hostCPUs, mMaxGuestCPU);
/* Limit min/max. size of QLineEdit */
- mLeCPU->setFixedWidthByText (QString().fill ('8', 3));
+ mLeCPU->setFixedWidthByText (QString().fill ('8', 4));
/* Ensure mLeMemory value and validation is updated */
valueChangedCPU (mSlCPU->value());
+
+ /* Setup cpu cap slider */
+ mSlCPUexeccap->setPageStep (10);
+ mSlCPUexeccap->setSingleStep (1);
+ mSlCPUexeccap->setTickInterval (10);
+ /* Setup the scale so that ticks are at page step boundaries */
+ mSlCPUexeccap->setMinimum (mMinGuestCPUexeccap);
+ mSlCPUexeccap->setMaximum (mMaxGuestCPUexeccap);
+ /* mSlCPUexeccap->setOptimalHint (1, hostCPUexeccaps); */
+ /* mSlCPUexeccap->setWarningHint (hostCPUexeccaps, mMaxGuestCPUexeccap); */
+ /* Limit min/max. size of QLineEdit */
+ mLeCPUexeccap->setFixedWidthByText (QString().fill ('8', 4));
+ /* Ensure mLeMemory value and validation is updated */
+ valueChangedCPUexeccap (mSlCPUexeccap->value());
+
/* Populate chipset combo: */
mCbChipset->insertItem(0, vboxGlobal().toString(KChipsetType_PIIX3), QVariant(KChipsetType_PIIX3));
mCbChipset->insertItem(1, vboxGlobal().toString(KChipsetType_ICH9), QVariant(KChipsetType_ICH9));
@@ -214,6 +238,7 @@
systemData.m_fNestedPagingEnabled = m_machine.GetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging);
systemData.m_iRAMSize = m_machine.GetMemorySize();
systemData.m_cCPUCount = systemData.m_fPFHwVirtExSupported ? m_machine.GetCPUCount() : 1;
+ systemData.m_cCPUexeccap = m_machine.GetCPUExecutionCap();
systemData.m_chipsetType = m_machine.GetChipsetType();
/* Cache system data: */
@@ -251,6 +276,7 @@
mCbNestedPaging->setChecked(systemData.m_fNestedPagingEnabled);
mSlMemory->setValue(systemData.m_iRAMSize);
mSlCPU->setValue(systemData.m_cCPUCount);
+ mSlCPUexeccap->setValue(systemData.m_cCPUexeccap);
int iChipsetPositionPos = mCbChipset->findData(systemData.m_chipsetType);
mCbChipset->setCurrentIndex(iChipsetPositionPos == -1 ? 0 : iChipsetPositionPos);
@@ -289,6 +315,7 @@
systemData.m_fNestedPagingEnabled = mCbNestedPaging->isChecked();
systemData.m_iRAMSize = mSlMemory->value();
systemData.m_cCPUCount = mSlCPU->value();
+ systemData.m_cCPUexeccap = mSlCPUexeccap->value();
systemData.m_chipsetType = (KChipsetType)mCbChipset->itemData(mCbChipset->currentIndex()).toInt();
/* Cache system data: */
@@ -334,6 +361,7 @@
/* Processor tab: */
m_machine.SetCPUCount(systemData.m_cCPUCount);
m_machine.SetCPUProperty(KCPUPropertyType_PAE, systemData.m_fPAEEnabled);
+ m_machine.SetCPUExecutionCap(systemData.m_cCPUexeccap);
/* Acceleration tab: */
m_machine.SetHWVirtExProperty(KHWVirtExPropertyType_Enabled, systemData.m_fHwVirtExEnabled);
m_machine.SetHWVirtExProperty(KHWVirtExPropertyType_NestedPaging, systemData.m_fNestedPagingEnabled);
@@ -398,7 +426,7 @@
.arg (totalCPUs);
return true;
}
-
+
/* VCPU IO-APIC test */
if (mSlCPU->value() > 1 && !mCbApic->isChecked())
{
@@ -421,6 +449,16 @@
return true;
}
+ /* CPU execution cap is low */
+ if (mSlCPUexeccap->value() < 40)
+ {
+ aWarning = tr (
+ "You have set CPU execution cap to low value, which may "
+ "distort audio and have other side effects. "
+ );
+ return true;
+ }
+
/* Chipset type & IO-APIC test */
if ((KChipsetType)mCbChipset->itemData(mCbChipset->currentIndex()).toInt() == KChipsetType_ICH9 && !mCbApic->isChecked())
{
@@ -463,7 +501,9 @@
/* Processor tab-order */
setTabOrder (mCbUseAbsHID, mSlCPU);
setTabOrder (mSlCPU, mLeCPU);
- setTabOrder (mLeCPU, mCbPae);
+ setTabOrder (mLeCPU, mSlCPUexeccap);
+ setTabOrder (mSlCPUexeccap, mLeCPUexeccap);
+ setTabOrder (mLeCPUexeccap, mCbPae);
/* Acceleration tab-order */
setTabOrder (mCbPae, mCbVirt);
@@ -487,6 +527,10 @@
/* Retranslate the cpu slider legend */
mLbCPUMin->setText (tr ("%1 CPU", "%1 is 1 for now").arg (mMinGuestCPU));
mLbCPUMax->setText (tr ("%1 CPUs", "%1 is host cpu count * 2 for now").arg (mMaxGuestCPU));
+
+ /* Retranslate the cpu cap slider legend */
+ mLbCPUexeccapMin->setText (tr ("%1 % CPU cap").arg (mMinGuestCPUexeccap));
+ mLbCPUexeccapMax->setText (tr ("%1 % CPU cap").arg (mMaxGuestCPUexeccap));
}
void UIMachineSettingsSystem::valueChangedRAM (int aVal)
@@ -532,6 +576,16 @@
mSlCPU->setValue (aText.toInt());
}
+void UIMachineSettingsSystem::valueChangedCPUexeccap (int aVal)
+{
+ mLeCPUexeccap->setText (QString().setNum (aVal));
+}
+
+void UIMachineSettingsSystem::textChangedCPUexeccap (const QString &aText)
+{
+ mSlCPUexeccap->setValue (aText.toInt());
+}
+
bool UIMachineSettingsSystem::eventFilter (QObject *aObject, QEvent *aEvent)
{
if (!aObject->isWidgetType())
@@ -601,6 +655,11 @@
mLbCPUMax->setEnabled(isMachineOffline());
mSlCPU->setEnabled(isMachineOffline() && systemData.m_fPFHwVirtExSupported);
mLeCPU->setEnabled(isMachineOffline() && systemData.m_fPFHwVirtExSupported);
+ mLbCPUexeccap->setEnabled(isMachineOffline());
+ mLbCPUexeccapMin->setEnabled(isMachineOffline());
+ mLbCPUexeccapMax->setEnabled(isMachineOffline());
+ mSlCPUexeccap->setEnabled(isMachineOffline());
+ mLeCPUexeccap->setEnabled(isMachineOffline());
mLbProcessorExtended->setEnabled(isMachineOffline());
mCbPae->setEnabled(isMachineOffline() && systemData.m_fPFPAESupported);
/* Acceleration tab: */
diff -uNr 1//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h 2//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h
--- 1//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h 2011-06-11 09:29:03.000000000 -0400
+++ 2//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h 2011-06-22 10:16:11.000000000 -0400
@@ -56,6 +56,7 @@
, m_fHwVirtExEnabled(false)
, m_fNestedPagingEnabled(false)
, m_iRAMSize(-1)
+ , m_cCPUexeccap(-1)
, m_cCPUCount(-1) {}
/* Functions: */
bool equal(const UIDataSettingsMachineSystem &other) const
@@ -72,6 +73,7 @@
(m_fHwVirtExEnabled == other.m_fHwVirtExEnabled) &&
(m_fNestedPagingEnabled == other.m_fNestedPagingEnabled) &&
(m_iRAMSize == other.m_iRAMSize) &&
+ (m_cCPUexeccap == other.m_cCPUexeccap);
(m_cCPUCount == other.m_cCPUCount);
}
/* Operators: */
@@ -91,6 +93,7 @@
bool m_fNestedPagingEnabled;
int m_iRAMSize;
int m_cCPUCount;
+ int m_cCPUexeccap;
};
typedef UISettingsCache UICacheSettingsMachineSystem;
@@ -148,7 +151,10 @@
void valueChangedCPU (int aVal);
void textChangedCPU (const QString &aText);
+ void valueChangedCPUexeccap (int aVal);
+ void textChangedCPUexeccap (const QString &aText);
+
private:
bool eventFilter (QObject *aObject, QEvent *aEvent);
@@ -161,6 +167,8 @@
uint mMinGuestCPU;
uint mMaxGuestCPU;
+ uint mMinGuestCPUexeccap;
+ uint mMaxGuestCPUexeccap;
QList m_possibleBootItems;
diff -uNr 1//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui 2//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui
--- 1//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui 2011-06-11 09:29:03.000000000 -0400
+++ 2//vbox/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.ui 2011-06-22 12:59:54.000000000 -0400
@@ -3,13 +3,13 @@
VBox frontends: Qt4 GUI ("VirtualBox"):
- Copyright (C) 2008 Oracle Corporation
+ Copyright (C) 2008-2011 Oracle Corporation
This file is part of VirtualBox Open Source Edition (OSE), as
available from http://www.virtualbox.org. This file is free software;
you can redistribute it and/or modify it under the terms of the GNU
General Public License (GPL) as published by the Free Software
- Foundation, in version 2 as it comes in the "COPYING" file of the
+ Foundation, in version 2 as it comes in the "COPYING" file of the
VirtualBox OSE distribution. VirtualBox OSE is distributed in the
hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -19,15 +19,15 @@
0
0
- 461
- 378
+ 578
+ 436
-
- 0
+ 1
@@ -190,11 +190,6 @@
true
-
-
-
-
-
-
@@ -382,33 +377,33 @@
-
-
-
-
+
+
+
0
0
-
+
-
+
If checked, the RTC device will report the time in UTC, otherwise in local (host) time. Unix usually expects the hardware clock to be set to UTC.
-
+
Hardware clock in &UTC time
-
-
-
-
+
+
+
0
0
-
+
-
+
If checked, an absolute pointing device (a USB tablet) will be supported. Otherwise, only a standard PS/2 mouse will be emulated.
-
+
Enable &absolute pointing device
@@ -528,16 +523,181 @@
- 0
+ 70
0
+
+
+ 70
+ 0
+
+
+
+
+ 70
+ 16777215
+
+
+
+
+ 70
+ 0
+
+
Controls the number of virtual CPUs in the virtual machine. You need hardware virtualization support on your host system to use more than one virtual CPU.
- -
+
-
+
+
+ Qt::Vertical
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ &CPU Execution Cap:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ mLeCPUexeccap
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ Controls the CPU execution cap of each virtual CPU. It defines how much cycles each virtual CPU can use as a percent of host's CPU. 100% = unlimited.
+
+
+ 4096
+
+
+ 200
+
+
+ 512
+
+
+ Qt::Horizontal
+
+
+ QSlider::TicksBelow
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
+
+
+
+ -
+
+
+
+ 70
+ 0
+
+
+
+
+ 70
+ 0
+
+
+
+
+ 70
+ 16777215
+
+
+
+
+ 70
+ 0
+
+
+
+ Controls the CPU execution cap of each virtual CPU. It defines how much cycles each virtual CPU can use as a percent of host's CPU. 100% = unlimited.
+
+
+
+
+
+
+
+
+ 32767
+
+
+ 0
+
+
+
+ -
Extended Features:
@@ -547,7 +707,7 @@
- -
+
-
@@ -563,15 +723,18 @@
- -
-
+
-
+
- Qt::Vertical
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
- 0
- 0
+ 40
+ 20
@@ -649,26 +812,11 @@
- UIBootTable
- QListWidget
-
-
-
QILineEdit
QLineEdit
- QIAdvancedSlider
- QSlider
-
-
-
- VBoxGuestRAMSlider
- QIAdvancedSlider
-
-
-
QIToolButton
QToolButton
@@ -677,6 +825,22 @@
QITabWidget
QTabWidget
+ 1
+
+
+ UIBootTable
+ QListWidget
+
+
+
+ QIAdvancedSlider
+ QSlider
+
+
+
+ VBoxGuestRAMSlider
+ QIAdvancedSlider
+