Changeset 42157 in vbox for trunk/src

Timestamp:

Jul 16, 2012 10:58:47 AM (13 years ago)

Author:

vboxsync

Message:

VMM: Detect VIA Cpus for VT-x support.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp

@@ -623 +623 @@
     g_HvmR0.pfnSetupVM          = hmR0DummySetupVM;
 
-    /* Default is global VT-x/AMD-V init */
+    /* Default is global VT-x/AMD-V init. */
     g_HvmR0.fGlobalInit         = true;
 
@@ -636 +636 @@
 
     /*
-     * Check for VT-x and AMD-V capabilities
+     * Check for VT-x and AMD-V capabilities.
      */
     int rc;
@@ -655 +655 @@
 
         /* Go to CPU specific initialization code. */
-        if (   u32VendorEBX == X86_CPUID_VENDOR_INTEL_EBX
-            && u32VendorECX == X86_CPUID_VENDOR_INTEL_ECX
-            && u32VendorEDX == X86_CPUID_VENDOR_INTEL_EDX)
+        if (   (   u32VendorEBX == X86_CPUID_VENDOR_INTEL_EBX
+                && u32VendorECX == X86_CPUID_VENDOR_INTEL_ECX
+                && u32VendorEDX == X86_CPUID_VENDOR_INTEL_EDX)
+            || (   u32VendorEBX == X86_CPUID_VENDOR_VIA_EBX
+                && u32VendorECX == X86_CPUID_VENDOR_VIA_ECX
+                && u32VendorEDX == X86_CPUID_VENDOR_VIA_EDX))
         {
             rc = hmR0InitIntel(u32FeaturesECX, u32FeaturesEDX);
@@ -783 +786 @@
        )
     {
-        /* MSR is not yet locked; we can change it ourselves here */
+        /* MSR is not yet locked; we can change it ourselves here. */
         ASMWrMsr(MSR_IA32_FEATURE_CONTROL,
                  g_HvmR0.vmx.msr.feature_ctrl | MSR_IA32_FEATURE_CONTROL_VMXON | MSR_IA32_FEATURE_CONTROL_LOCK);