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

Timestamp:

Mar 24, 2014 2:11:10 PM (11 years ago)

Author:

vboxsync

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

92946

Message:

VMM: Assert 4K alignment on global VT-x and AMD-V physical pages. Change some release assertions to debug ones.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (2 diffs)

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

@@ -321 +321 @@
                               void *pvArg)
 {
+    Assert(!fEnabledByHost);
+    Assert(HCPhysCpuPage && HCPhysCpuPage != NIL_RTHCPHYS);
+    Assert(RT_ALIGN_T(HCPhysCpuPage, _4K, RTHCPHYS) == HCPhysCpuPage);
+    Assert(pvCpuPage);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-    AssertReturn(!fEnabledByHost, VERR_INVALID_PARAMETER);
-    AssertReturn(   HCPhysCpuPage
-                 && HCPhysCpuPage != NIL_RTHCPHYS, VERR_INVALID_PARAMETER);
-    AssertReturn(pvCpuPage, VERR_INVALID_PARAMETER);
+
     NOREF(pvArg);
     NOREF(fEnabledByHost);

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

@@ -742 +742 @@
 static int hmR0VmxEnterRootMode(PVM pVM, RTHCPHYS HCPhysCpuPage, void *pvCpuPage)
 {
-    AssertReturn(HCPhysCpuPage != 0 && HCPhysCpuPage != NIL_RTHCPHYS, VERR_INVALID_PARAMETER);
-    AssertReturn(pvCpuPage, VERR_INVALID_PARAMETER);
+    Assert(HCPhysCpuPage && HCPhysCpuPage != NIL_RTHCPHYS);
+    Assert(RT_ALIGN_T(HCPhysCpuPage, _4K, RTHCPHYS) == HCPhysCpuPage);
+    Assert(pvCpuPage);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
@@ -1046 +1047 @@
                               void *pvMsrs)
 {
-    AssertReturn(pCpu, VERR_INVALID_PARAMETER);
-    AssertReturn(pvMsrs, VERR_INVALID_PARAMETER);
+    Assert(pCpu);
+    Assert(pvMsrs);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));