Changeset 50310 in vbox for trunk

Timestamp:

Feb 3, 2014 3:11:24 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6713: Fix to r91875: More strict check for 64bit guest OS type support.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UINameAndSystemEditor.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (3 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.h (modified) (1 diff)

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

@@ -198 +198 @@
     {
         QString strDefaultID = "WindowsXP";
-        if (ARCH_BITS == 64)
+        if (m_fSupportsHWVirtEx && m_fSupportsLongMode)
             strDefaultID += "_64";
         int iIndexWinXP = m_pTypeCombo->findData(strDefaultID, TypeID);
@@ -208 +208 @@
     {
         QString strDefaultID = "Ubuntu";
-        if (ARCH_BITS == 64)
+        if (m_fSupportsHWVirtEx && m_fSupportsLongMode)
             strDefaultID += "_64";
         int iIndexUbuntu = m_pTypeCombo->findData(strDefaultID, TypeID);

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

@@ -33 +33 @@
 /* COM includes: */
 #include "CSystemProperties.h"
-
-/* Other VBox includes: */
-#include <iprt/system.h>
 
 /* Defines some patterns to guess the right OS type. Should be in sync with
@@ -163 +160 @@
     : m_strGroup(strGroup)
 {
+    CHost host = vboxGlobal().host();
+    m_fSupportsHWVirtEx = host.GetProcessorFeature(KProcessorFeature_HWVirtEx);
+    m_fSupportsLongMode = host.GetProcessorFeature(KProcessorFeature_LongMode);
 }
 
@@ -168 +168 @@
 {
     /* Do not forget about achitecture bits: */
-    strNewName += QString::number(ARCH_BITS);
+    strNewName += m_fSupportsHWVirtEx && m_fSupportsLongMode ? "64" : "32";
 
     /* Search for a matching OS type based on the string the user typed already. */

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

@@ -61 +61 @@
     /* Variables: */
     QString m_strGroup;
+    bool m_fSupportsHWVirtEx;
+    bool m_fSupportsLongMode;
 };