Changeset 74632 in vbox for trunk/include/VBox/vmm

Timestamp:

Oct 6, 2018 3:14:32 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Let the caller check for VMX non-root mode and free-up the intercept functions to check
only the intercepts. Allows code to check non-root mode once in different places if a lot of intercepts need to be checked.

File:

• trunk/include/VBox/vmm/cpum.h (modified) (3 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -1889 +1889 @@
 {
     RT_NOREF(pVCpu);
-    if (pCtx->hwvirt.enmHwvirt != CPUMHWVIRT_VMX)
-        return false;
-    if (!pCtx->hwvirt.vmx.fInVmxNonRootMode)
-        return false;
+    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
+    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
     Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
     return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32PinCtls & uPinCtl);
@@ -1912 +1910 @@
 {
     RT_NOREF(pVCpu);
-    if (pCtx->hwvirt.enmHwvirt != CPUMHWVIRT_VMX)
-        return false;
-    if (!pCtx->hwvirt.vmx.fInVmxNonRootMode)
-        return false;
+    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
+    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
     Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
     return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ProcCtls & uProcCtl);
@@ -1937 +1933 @@
 {
     RT_NOREF(pVCpu);
-    if (pCtx->hwvirt.enmHwvirt != CPUMHWVIRT_VMX)
-        return false;
-    if (!pCtx->hwvirt.vmx.fInVmxNonRootMode)
-        return false;
+    Assert(pCtx->hwvirt.enmHwvirt == CPUMHWVIRT_VMX);
+    Assert(pCtx->hwvirt.vmx.fInVmxNonRootMode);
     Assert(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs));
     return RT_BOOL(pCtx->hwvirt.vmx.CTX_SUFF(pVmcs)->u32ProcCtls2 & uProcCtl2);