Changeset 20285 in vbox

Timestamp:

Jun 4, 2009 1:56:13 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

48168

Message:

FE/Qt4 & Guest SMP: Disallow 64 bits SMP guests on 32 bits hosts - Implemented.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMSettingsSystem.h (modified) (1 diff)
• src/VBoxSettingsDialogSpecific.cpp (modified) (3 diffs)
• src/VBoxVMSettingsSystem.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsSystem.h

@@ -38 +38 @@
 
     bool isHWVirtExEnabled() const;
+    int cpuCount() const;
 
 signals:

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

@@ -526 +526 @@
      * different pages of VM Settings dialog */
 
-    /* Guest OS type & VT-x/AMD-V option correlation test */
     if (aPage == mSelector->idToPage (GeneralId) ||
         aPage == mSelector->idToPage (SystemId))
@@ -535 +534 @@
             qobject_cast <VBoxVMSettingsSystem*> (mSelector->idToPage (SystemId));
 
+        /* Guest OS type & VT-x/AMD-V option correlation test */
         if (generalPage && systemPage &&
             generalPage->is64BitOSTypeSelected() && !systemPage->isHWVirtExEnabled())
         {
             aWarning = tr (
-                "there is a 64 bits guest OS type assigned for this VM, which "
+                "there is a 64-bit guest OS type assigned for this VM, which "
                 "requires virtualization feature (VT-x/AMD-V) to be enabled "
-                "too, else your guest will fail to detect a 64 bits CPU and "
+                "too, else your guest will fail to detect a 64-bit CPU and "
                 "will not be able to boot, so this feature will be enabled "
                 "automatically when you'll accept VM Settings by pressing OK "
@@ -547 +547 @@
             return true;
         }
+
+#ifndef Q_WS_MAC
+        /* Guest OS bitness & SMP slider correlation test */
+        if (ARCH_BITS == 32 && generalPage && systemPage &&
+            generalPage->is64BitOSTypeSelected() && systemPage->cpuCount() > 1)
+        {
+            aWarning = tr (
+                "there is a 64-bit guest OS type selected for this VM. "
+                "VirtualBox does currently not support more than one virtual CPU "
+                "for 64-bit guests executed on 32-bit hosts.");
+            return false;
+        }
+#endif
     }
 

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

@@ -128 +128 @@
 {
     return mCbVirt->isChecked();
+}
+
+int VBoxVMSettingsSystem::cpuCount() const
+{
+    return mSlCPU->value();
 }