Changeset 61073 in vbox

Timestamp:

May 20, 2016 3:01:00 AM (9 years ago)

Author:

vboxsync

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

107340

Message:

VMMPatchHypercall: Use CPUMGetHostCpuVendor() instead of three ASMIsXxxCpu() calls to figure out the host CPU.

File:

• trunk/src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/VMMAll.cpp

@@ -414 +414 @@
     AssertReturn(pcbWritten, VERR_INVALID_POINTER);
 
-    NOREF(pVM);
-
-    if (ASMIsAmdCpu())
-    {
-        uint8_t abHypercall[] = { 0x0F, 0x01, 0xD9 };   /* VMMCALL */
-        if (RT_LIKELY(cbBuf >= sizeof(abHypercall)))
-        {
-            memcpy(pvBuf, abHypercall, sizeof(abHypercall));
-            *pcbWritten = sizeof(abHypercall);
-            return VINF_SUCCESS;
-        }
-        return VERR_BUFFER_OVERFLOW;
-    }
-    else
-    {
-        AssertReturn(ASMIsIntelCpu() || ASMIsViaCentaurCpu(), VERR_UNSUPPORTED_CPU);
-        uint8_t abHypercall[] = { 0x0F, 0x01, 0xC1 };   /* VMCALL */
-        if (RT_LIKELY(cbBuf >= sizeof(abHypercall)))
-        {
-            memcpy(pvBuf, abHypercall, sizeof(abHypercall));
-            *pcbWritten = sizeof(abHypercall);
-            return VINF_SUCCESS;
-        }
-        return VERR_BUFFER_OVERFLOW;
+    CPUMCPUVENDOR enmHostCpu = CPUMGetHostCpuVendor(pVM);
+    switch (enmHostCpu)
+    {
+        case CPUMCPUVENDOR_AMD:
+        {
+            uint8_t abHypercall[] = { 0x0F, 0x01, 0xD9 };   /* VMMCALL */
+            if (RT_LIKELY(cbBuf >= sizeof(abHypercall)))
+            {
+                memcpy(pvBuf, abHypercall, sizeof(abHypercall));
+                *pcbWritten = sizeof(abHypercall);
+                return VINF_SUCCESS;
+            }
+            return VERR_BUFFER_OVERFLOW;
+        }
+
+        case CPUMCPUVENDOR_INTEL:
+        case CPUMCPUVENDOR_VIA:
+        {
+            uint8_t abHypercall[] = { 0x0F, 0x01, 0xC1 };   /* VMCALL */
+            if (RT_LIKELY(cbBuf >= sizeof(abHypercall)))
+            {
+                memcpy(pvBuf, abHypercall, sizeof(abHypercall));
+                *pcbWritten = sizeof(abHypercall);
+                return VINF_SUCCESS;
+            }
+            return VERR_BUFFER_OVERFLOW;
+        }
+
+        default:
+            AssertFailed();
+            return VERR_UNSUPPORTED_CPU;
     }
 }