儲存庫 vbox 的更動 49769

時間撮記:

2013-12-4 上午10:27:18 (11 年 以前)

作者:

vboxsync

訊息:

Main/ConsoleImpl2: don't allow 64-bit guests on hosts without VT-x/AMD-V

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (修改) (3 筆差異)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -967 +967 @@
          * Hardware virtualization extensions.
          */
+        BOOL fSupportsHwVirtEx;
+        hrc = host->GetProcessorFeature(ProcessorFeature_HWVirtEx, &fSupportsHwVirtEx);     H();
+
         BOOL fIsGuest64Bit;
         hrc = pMachine->GetCPUProperty(CPUPropertyType_LongMode, &fIsGuest64Bit);           H();
-        BOOL fSupportsLongMode;
-        hrc = host->GetProcessorFeature(ProcessorFeature_LongMode, &fSupportsLongMode);     H();
-        if (!fSupportsLongMode && fIsGuest64Bit)
-        {
-            LogRel(("WARNING! 64-bit guest type selected but the host CPU does NOT support 64-bit.\n"));
-            fIsGuest64Bit = FALSE;
+        if (fIsGuest64Bit)
+        {
+            BOOL fSupportsLongMode;
+            hrc = host->GetProcessorFeature(ProcessorFeature_LongMode, &fSupportsLongMode); H();
+            if (!fSupportsLongMode)
+            {
+                LogRel(("WARNING! 64-bit guest type selected but the host CPU does NOT support 64-bit.\n"));
+                fIsGuest64Bit = FALSE;
+            }
+            if (!fSupportsHwVirtEx)
+            {
+                LogRel(("WARNING! 64-bit guest type selected but the host CPU does NOT support HW virtualization.\n"));
+                fIsGuest64Bit = FALSE;
+            }
         }
 
         BOOL fHMEnabled;
-        hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Enabled, &fHMEnabled); H();
+        hrc = pMachine->GetHWVirtExProperty(HWVirtExPropertyType_Enabled, &fHMEnabled);     H();
         if (cCpus > 1 && !fHMEnabled)
         {
             LogRel(("Forced fHMEnabled to TRUE by SMP guest.\n"));
             fHMEnabled = TRUE;
-        }
-        if (!fHMEnabled && fIsGuest64Bit)
-        {
-            LogRel(("WARNING! 64-bit guest type selected on host without hardware virtualization (VT-x or AMD-V).\n"));
-            fIsGuest64Bit = FALSE;
         }
 
@@ -1167 +1173 @@
             hrc = bwGroups[i]->COMGETTER(Name)(strName.asOutParam());                       H();
             hrc = bwGroups[i]->COMGETTER(Type)(&enmType);                                   H();
-            hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                       H();
+            hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                 H();
 
             if (enmType == BandwidthGroupType_Disk)
@@ -1355 +1361 @@
         Mouse *pMouse = mMouse;
         PointingHIDType_T aPointingHID;
-        hrc = pMachine->COMGETTER(PointingHIDType)(&aPointingHID);          H();
+        hrc = pMachine->COMGETTER(PointingHIDType)(&aPointingHID);                          H();
         InsertConfigNode(pInst,    "LUN#1", &pLunL0);
         InsertConfigString(pLunL0, "Driver",               "MouseQueue");