Changeset 74514 in vbox

Timestamp:

Sep 28, 2018 9:44:47 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 VM-exit intercepts for VMCALL and VMXON.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -16 +16 @@
  */
 
-
-/**
- * Implements 'VMCALL'.
- */
-IEM_CIMPL_DEF_0(iemCImpl_vmcall)
-{
-    /** @todo NSTVMX: intercept. */
-
-    /* Join forces with vmmcall. */
-    return IEM_CIMPL_CALL_1(iemCImpl_Hypercall, OP_VMCALL);
-}
 
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
@@ -5673 +5662 @@
     {
         /* Nested-guest intercept. */
-        RT_NOREF(pExitInfo);
-        /** @todo NSTVMX: intercept. */
+        if (pExitInfo)
+            return iemVmxVmexitInstrWithInfo(pVCpu, pExitInfo);
+        return iemVmxVmexitInstrNeedsInfo(pVCpu, VMX_EXIT_VMXON, VMXINSTRID_NONE, cbInstr);
     }
 
@@ -5849 +5839 @@
 }
 
+#endif  /* VBOX_WITH_NESTED_HWVIRT_VMX */
+
+
+/**
+ * Implements 'VMCALL'.
+ */
+IEM_CIMPL_DEF_0(iemCImpl_vmcall)
+{
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+    /* Nested-guest intercept. */
+    if (IEM_IS_VMX_NON_ROOT_MODE(pVCpu))
+        return iemVmxVmexitInstr(pVCpu, VMX_EXIT_VMCALL, cbInstr);
 #endif
 
+    /* Join forces with vmmcall. */
+    return IEM_CIMPL_CALL_1(iemCImpl_Hypercall, OP_VMCALL);
+}
+