Changeset 39968 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 2, 2012 7:26:12 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: cache vboxGlobal().virtualBox().GetHost()

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (7 diffs)
• globals/VBoxGlobal.h (modified) (3 diffs)
• runtime/UIMachineLogic.cpp (modified) (3 diffs)
• runtime/UISession.cpp (modified) (1 diff)
• selector/UIVMDesktop.cpp (modified) (2 diffs)
• settings/UISettingsDialogSpecific.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsNetwork.cpp (modified) (4 diffs)
• settings/machine/UIMachineSettingsNetwork.cpp (modified) (3 diffs)
• settings/machine/UIMachineSettingsSystem.cpp (modified) (4 diffs)
• settings/machine/UIMachineSettingsUSB.cpp (modified) (2 diffs)
• widgets/VBoxGuestRAMSlider.cpp (modified) (1 diff)
• widgets/VBoxOSTypeSelectorWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -19 +19 @@
 #include <VBox/vd.h>
 #include <VBox/version.h>
-#include <stdio.h>
+#include <iprt/stream.h>
 
 #include "VBoxUtils.h"
@@ -283 +283 @@
     , mRecompileUser(false)
     , mVerString("1.0")
-    , m3DAvailable(-1)
+    , m3DAvailable(false)
 {
 }
@@ -393 +393 @@
 }
 
-bool VBoxGlobal::is3DAvailable()
-{
-    if (m3DAvailable < 0)
-        m3DAvailable = virtualBox().GetHost().GetAcceleration3DAvailable();
-    return m3DAvailable;
-}
-
 /**
  *  Sets the new global settings and saves them to the VirtualBox server.
@@ -1666 +1659 @@
 
         /* VT-x/AMD-V availability: */
-        bool fVTxAMDVSupported = virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
+        bool fVTxAMDVSupported = host().GetProcessorFeature(KProcessorFeature_HWVirtEx);
 
         if (fVTxAMDVSupported)
@@ -2413 +2406 @@
     addNullMediumToList (mMediaList, mMediaList.end());
     addHardDisksToList (mVBox.GetHardDisks(), mMediaList, mMediaList.end());
-    addMediumsToList (mVBox.GetHost().GetDVDDrives(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_DVD);
+    addMediumsToList (mHost.GetDVDDrives(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_DVD);
     addMediumsToList (mVBox.GetDVDImages(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_DVD);
-    addMediumsToList (mVBox.GetHost().GetFloppyDrives(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_Floppy);
+    addMediumsToList (mHost.GetFloppyDrives(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_Floppy);
     addMediumsToList (mVBox.GetFloppyImages(), mMediaList, mMediaList.end(), VBoxDefs::MediumType_Floppy);
 
@@ -4800 +4793 @@
         return;
     }
+    mHost = virtualBox().GetHost();
+    m3DAvailable = mHost.GetAcceleration3DAvailable();
 
     /* create default non-null global settings */
@@ -5458 +5453 @@
     mUSBDevicesMap.clear();
 
-    CHost host = vboxGlobal().virtualBox().GetHost();
+    CHost host = vboxGlobal().host();
 
     bool isUSBEmpty = host.GetUSBDevices().size() == 0;

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -135 +135 @@
 
     CVirtualBox virtualBox() const { return mVBox; }
+    CHost host() const { return mHost; }
 
     VBoxGlobalSettings &settings() { return gset; }
@@ -150 +151 @@
     QWidget *mainWindow() const { return mMainWindow; }
 
-    bool is3DAvailable();
+    bool is3DAvailable() const { return m3DAvailable; }
 
 #ifdef VBOX_GUI_WITH_PIDFILE
@@ -806 +807 @@
 
     CVirtualBox mVBox;
+    CHost mHost;
 
     VBoxGlobalSettings gset;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1077 +1077 @@
             {
                 case VBoxDefs::MediumType_DVD:
-                    mediums = vboxGlobal().virtualBox().GetHost().GetDVDDrives();
+                    mediums = vboxGlobal().host().GetDVDDrives();
                     strRecentMediumAddress = VBoxDefs::GUI_RecentListCD;
                     break;
                 case VBoxDefs::MediumType_Floppy:
-                    mediums = vboxGlobal().virtualBox().GetHost().GetFloppyDrives();
+                    mediums = vboxGlobal().host().GetFloppyDrives();
                     strRecentMediumAddress = VBoxDefs::GUI_RecentListFD;
                     break;
@@ -1366 +1366 @@
 
     /* Get current host: */
-    CHost host = vboxGlobal().virtualBox().GetHost();
+    CHost host = vboxGlobal().host();
 
     /* Get host USB device list: */
@@ -1435 +1435 @@
         {
             /* Get current host: */
-            CHost host = vboxGlobal().virtualBox().GetHost();
+            CHost host = vboxGlobal().host();
             /* Search the host for the corresponding USB device: */
             CHostUSBDevice hostDevice = host.FindUSBDeviceById(target.id);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -270 +270 @@
         bool fShouldWeClose;
 
-        bool fVTxAMDVSupported = vboxGlobal().virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
+        bool fVTxAMDVSupported = vboxGlobal().host().GetProcessorFeature(KProcessorFeature_HWVirtEx);
 
         QApplication::processEvents();

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp

@@ -275 +275 @@
     /* Variables: */
     CVirtualBox m_vbox;
+    CHost m_host;
     UIDetails *m_pUIDetails;
     int m_iBlockNumber;
@@ -625 +626 @@
     : QWidget(pParent)
     , m_vbox(vboxGlobal().virtualBox())
+    , m_host(vboxGlobal().host())
     , m_pUIDetails(pParent)
     , m_iBlockNumber(iBlockNumber)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -533 +533 @@
 #ifdef ENABLE_GLOBAL_USB
             /* Get the host object: */
-            CHost host = vboxGlobal().virtualBox().GetHost();
+            CHost host = vboxGlobal().host();
             /* Show the host error message if any: */
             if (!host.isReallyOk())

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp

@@ -252 +252 @@
 
     /* Load to cache: */
-    const CHostNetworkInterfaceVector &interfaces = vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
+    const CHostNetworkInterfaceVector &interfaces = vboxGlobal().host().GetNetworkInterfaces();
     for (int iNetworkIndex = 0; iNetworkIndex < interfaces.size(); ++iNetworkIndex)
     {
@@ -305 +305 @@
     /* Prepare useful variables: */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    CHost host = vbox.GetHost();
+    CHost host = vboxGlobal().host();
 
     /* Update all the host-only interfaces: */
@@ -411 +411 @@
     /* Prepare useful variables: */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    CHost host = vbox.GetHost();
+    CHost host = vboxGlobal().host();
 
     /* Create new host-only interface: */
@@ -457 +457 @@
     /* Prepare useful variables: */
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    CHost host = vbox.GetHost();
+    CHost host = vboxGlobal().host();
 
     /* Find corresponding interface: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -480 +480 @@
 void UIMachineSettingsNetwork::sltGenerateMac()
 {
-    m_pMACEditor->setText(vboxGlobal().virtualBox().GetHost().GenerateMACAddress());
+    m_pMACEditor->setText(vboxGlobal().host().GenerateMACAddress());
 }
 
@@ -1001 +1001 @@
     /* Reload bridged interface list: */
     m_bridgedAdapterList.clear();
-    const CHostNetworkInterfaceVector &ifaces = vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
+    const CHostNetworkInterfaceVector &ifaces = vboxGlobal().host().GetNetworkInterfaces();
     for (int i = 0; i < ifaces.size(); ++i)
     {
@@ -1034 +1034 @@
     /* Reload host-only interface list: */
     m_hostInterfaceList.clear();
-    const CHostNetworkInterfaceVector &ifaces = vboxGlobal().virtualBox().GetHost().GetNetworkInterfaces();
+    const CHostNetworkInterfaceVector &ifaces = vboxGlobal().host().GetNetworkInterfaces();
     for (int i = 0; i < ifaces.size(); ++i)
     {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp

@@ -39 +39 @@
     /* Setup constants */
     CSystemProperties properties = vboxGlobal().virtualBox().GetSystemProperties();
-    uint hostCPUs = vboxGlobal().virtualBox().GetHost().GetProcessorCount();
+    uint hostCPUs = vboxGlobal().host().GetProcessorCount();
     mMinGuestCPU = properties.GetMinGuestCPUCount();
     mMaxGuestCPU = RT_MIN (2 * hostCPUs, properties.GetMaxGuestCPUCount());
@@ -227 +227 @@
     }
     /* Gather other system data: */
-    systemData.m_fPFHwVirtExSupported = vboxGlobal().virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_HWVirtEx);
-    systemData.m_fPFPAESupported = vboxGlobal().virtualBox().GetHost().GetProcessorFeature(KProcessorFeature_PAE);
+    systemData.m_fPFHwVirtExSupported = vboxGlobal().host().GetProcessorFeature(KProcessorFeature_HWVirtEx);
+    systemData.m_fPFPAESupported = vboxGlobal().host().GetProcessorFeature(KProcessorFeature_PAE);
     systemData.m_fIoApicEnabled = m_machine.GetBIOSSettings().GetIOAPICEnabled();
     systemData.m_fEFIEnabled = m_machine.GetFirmwareType() >= KFirmwareType_EFI && m_machine.GetFirmwareType() <= KFirmwareType_EFIDUAL;
@@ -387 +387 @@
 bool UIMachineSettingsSystem::revalidate (QString &aWarning, QString & /* aTitle */)
 {
-    ulong fullSize = vboxGlobal().virtualBox().GetHost().GetMemorySize();
+    ulong fullSize = vboxGlobal().host().GetMemorySize();
     if (mSlMemory->value() > (int)mSlMemory->maxRAMAlw())
     {
@@ -410 +410 @@
 
     /* VCPU amount test */
-    int totalCPUs = vboxGlobal().virtualBox().GetHost().GetProcessorOnlineCount();
+    int totalCPUs = vboxGlobal().host().GetProcessorOnlineCount();
     if (mSlCPU->value() > 2 * totalCPUs)
     {

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -155 +155 @@
         {
             /* For each USB filter: */
-            const CHostUSBDeviceFilterVector &filters = vboxGlobal().virtualBox().GetHost().GetUSBDeviceFilters();
+            const CHostUSBDeviceFilterVector &filters = vboxGlobal().host().GetUSBDeviceFilters();
             for (int iFilterIndex = 0; iFilterIndex < filters.size(); ++iFilterIndex)
             {
@@ -350 +350 @@
                 {
                     /* Get host: */
-                    CHost host = vboxGlobal().virtualBox().GetHost();
+                    CHost host = vboxGlobal().host();
                     /* For each USB filter data set: */
                     for (int iFilterIndex = 0; iFilterIndex < m_cache.childCount(); ++iFilterIndex)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp

@@ -64 +64 @@
 void VBoxGuestRAMSlider::init()
 {
-    ulong fullSize = vboxGlobal().virtualBox().GetHost().GetMemorySize();
+    ulong fullSize = vboxGlobal().host().GetMemorySize();
     CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties();
     mMinRAM = sys.GetMinGuestRAM();

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp

@@ -54 +54 @@
 
     /* Check if host supports (AMD-V or VT-x) and long mode */
-    CHost host = vboxGlobal().virtualBox().GetHost();
+    CHost host = vboxGlobal().host();
     m_fSupportsHWVirtEx = host.GetProcessorFeature(KProcessorFeature_HWVirtEx);
     m_fSupportsLongMode = host.GetProcessorFeature(KProcessorFeature_LongMode);