Changeset 52672 in vbox

Timestamp:

Sep 10, 2014 11:27:22 AM (10 years ago)

Author:

vboxsync

Message:

VMM/GIM/Minimal: Expose hypervisor timing information leaves.

File:

• trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/GIMMinimal.cpp

@@ -25 +25 @@
 #include <iprt/err.h>
 #include <iprt/asm-amd64-x86.h>
+#include <iprt/string.h>
 
 #include <VBox/vmm/cpum.h>
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/tm.h>
+#include <VBox/vmm/pdmapi.h>
 
 /*******************************************************************************
@@ -43 +46 @@
     CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP);
 
+    /*
+     * Expose a generic hypervisor-agnostic leaf (originally defined VMware).
+     * The leaves range from  0x40000010 to 0x400000FF.
+     */
+    CPUMCPUIDLEAF HyperLeaf;
+    int rc = CPUMR3CpuIdGetLeaf(pVM, &HyperLeaf, 0x40000000, 0 /* uSubLeaf */);
+    if (RT_SUCCESS(rc))
+    {
+        HyperLeaf.uEax         = UINT32_C(0x40000010);  /* Maximum leaf we implement. */
+        rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+        AssertLogRelRCReturn(rc, rc);
+
+        /*
+         * Add the timing information hypervisor leaf.
+         * MacOS X uses this to determine the TSC, bus frequency. See @bugref{7270}.
+         *
+         * EAX - TSC frequency in KHz.
+         * EBX - APIC frequency in KHz.
+         * ECX, EDX - Reserved.
+         */
+        uint64_t uApicFreq;
+        rc = PDMApicGetTimerFreq(pVM, &uApicFreq);
+        AssertLogRelRCReturn(rc, rc);
+
+        RT_ZERO(HyperLeaf);
+        HyperLeaf.uLeaf        = UINT32_C(0x40000010);
+        HyperLeaf.uEax         = TMCpuTicksPerSecond(pVM) / UINT64_C(1000);
+        HyperLeaf.uEbx         = uApicFreq / UINT64_C(1000);
+        rc = CPUMR3CpuIdInsert(pVM, &HyperLeaf);
+        AssertLogRelRCReturn(rc, rc);
+    }
+
     return VINF_SUCCESS;
 }