Changeset 67155 in vbox

Timestamp:

May 31, 2017 9:08:13 AM (8 years ago)

Author:

vboxsync

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

115831

Message:

cpum.h: Nested Hw.virt: adjustments.

File:

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

trunk/include/VBox/vmm/cpum.h

@@ -1388 +1388 @@
 
 /**
- * Checks if we are executing inside the nested hardware-virtualized guest.
- *
- * @returns true if in nested-guest mode, false otherwise.
+ * Checks if we are executing inside an SVM nested hardware-virtualized guest.
+ *
+ * @returns true if in SVM nested-guest mode, false otherwise.
  * @param   pCtx        Pointer to the context.
  */
-DECLINLINE(bool) CPUMIsGuestInNestedHwVirtMode(PCCPUMCTX pCtx)
+DECLINLINE(bool) CPUMIsGuestInSvmNestedHwVirtMode(PCCPUMCTX pCtx)
 {
     /*
@@ -1400 +1400 @@
      */
     return RT_BOOL(pCtx->hwvirt.svm.VmcbCtrl.u64InterceptCtrl & SVM_CTRL_INTERCEPT_VMRUN);
-    /** @todo Intel VMX.  */
+}
+
+/**
+ * Checks if we are executing inside a VMX nested hardware-virtualized guest.
+ *
+ * @returns true if in VMX nested-guest mode, false otherwise.
+ * @param   pCtx        Pointer to the context.
+ */
+DECLINLINE(bool) CPUMIsGuestInVmxNestedHwVirtMode(PCCPUMCTX pCtx)
+{
+    RT_NOREF1(pCtx);
+    /** @todo Intel. */
+    return false;
+}
+
+/**
+ * Checks if we are executing inside a nested hardware-virtualized guest.
+ *
+ * @returns true if in SVM/VMX nested-guest mode, false otherwise.
+ * @param   pCtx        Pointer to the context.
+ */
+DECLINLINE(bool) CPUMIsGuestInNestedHwVirtMode(PCCPUMCTX pCtx)
+{
+    return CPUMIsGuestInSvmNestedHwVirtMode(pCtx) || CPUMIsGuestInVmxNestedHwVirtMode(pCtx);
 }
 #endif /* VBOX_WITHOUT_UNNAMED_UNIONS */