Changeset 42173 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jul 17, 2012 10:15:18 AM (12 years ago)

Author:

vboxsync

Message:

VMM/HWVMXR0: Fixed assertion in saved states due to differing CpuIds.

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (3 diffs)

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

@@ -1372 +1372 @@
 # endif
 
-        if (pVCpu->hwaccm.s.vmx.proc_ctls2 & VMX_VMCS_CTRL_PROC_EXEC2_RDTSCP)
-        {
-            Assert(u32HostExtFeatures & X86_CPUID_EXT_FEATURE_EDX_RDTSCP);
+        if (   (u32HostExtFeatures & X86_CPUID_EXT_FEATURE_EDX_RDTSCP)
+            && pVCpu->hwaccm.s.vmx.proc_ctls2 & VMX_VMCS_CTRL_PROC_EXEC2_RDTSCP)
+        {
             pMsr->u32IndexMSR = MSR_K8_TSC_AUX;
             pMsr->u32Reserved = 0;
@@ -2168 +2168 @@
     }
 
-    if (pVCpu->hwaccm.s.vmx.proc_ctls2 & VMX_VMCS_CTRL_PROC_EXEC2_RDTSCP)
-    {
-        Assert(u32GstExtFeatures & X86_CPUID_EXT_FEATURE_EDX_RDTSCP);
+    if (   pVCpu->hwaccm.s.vmx.proc_ctls2 & VMX_VMCS_CTRL_PROC_EXEC2_RDTSCP
+        && (u32GstExtFeatures & X86_CPUID_EXT_FEATURE_EDX_RDTSCP))
+    {
         pMsr->u32IndexMSR = MSR_K8_TSC_AUX;
         pMsr->u32Reserved = 0;
@@ -3971 +3971 @@
 
     /*
-     * 48 EPT violation. An attemp to access memory with a guest-physical address was disallowed
+     * 48 EPT violation. An attempt to access memory with a guest-physical address was disallowed
      * by the configuration of the EPT paging structures.
      */