Changeset 95066 in vbox

Timestamp:

May 23, 2022 8:06:48 PM (3 years ago)

Author:

vboxsync

Message:

Main/ConsoleImpl2.cpp: No need to check for the host's VT-x/AMD-V and long mode capabilities anymore, just enable things based on guest CPU configs. (ARM64 has no long mode. In driverless/NEM mode we shouldn't care about VT-x/AMD-V, ditto for arm64.) bugref:9898 bugref:10138

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)

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

@@ -1170 +1170 @@
          * Hardware virtualization extensions.
          */
-        BOOL fSupportsHwVirtEx;
-        hrc = host->GetProcessorFeature(ProcessorFeature_HWVirtEx, &fSupportsHwVirtEx);     H();
-
         BOOL fIsGuest64Bit;
         hrc = pMachine->GetCPUProperty(CPUPropertyType_LongMode, &fIsGuest64Bit);           H();
-        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;
-            }
-        }
 
         /* Sanitize valid/useful APIC combinations, see @bugref{8868}. */
@@ -3637 +3619 @@
                 InsertConfigInteger(pCfg,  "McfgBase",   uMcfgBase);
                 InsertConfigInteger(pCfg,  "McfgLength", cbMcfgLength);
-                /* 64-bit prefetch window root resource:
-                 * Only for ICH9 and if PAE or Long Mode is enabled.
-                 * And only with hardware virtualization (@bugref{5454}). */
-                if (   (fEnablePAE || fIsGuest64Bit)
-                    && fSupportsHwVirtEx /* HwVirt needs to be supported by the host
-                                            otherwise VMM falls back to raw mode */
-                    && fHMEnabled        /* HwVirt needs to be enabled in VM config */)
+                /* 64-bit prefetch window root resource: Only for ICH9 and if PAE or Long Mode is enabled (@bugref{5454}). */
+                if (fIsGuest64Bit || fEnablePAE)
                     InsertConfigInteger(pCfg,  "PciPref64Enabled", 1);
             }