Changeset 72462 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

Timestamp:

Jun 6, 2018 2:24:04 PM (7 years ago)

Author:

vboxsync

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

122946

Message:

EM,IEM,HM: Consolidated VMMHypercallsDisable/VMMHypercallsEnable into EMSetHypercallInstructionsEnabled and made the information available thru EMAreHypercallInstructionsEnabled(). Adjusted the vmmcall implementation so it works without HM. bugref:9044

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (1 diff)

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

@@ -22 +22 @@
 IEM_CIMPL_DEF_0(iemCImpl_vmcall)
 {
-    if (true /*EMAreHypercallsEnabled(pVCpu)*/)
-    {
-        VBOXSTRICTRC rcStrict = GIMHypercall(pVCpu, IEM_GET_CTX(pVCpu));
-        if (RT_SUCCESS(rcStrict))
-        {
-            if (rcStrict == VINF_SUCCESS)
-                iemRegAddToRipAndClearRF(pVCpu, cbInstr);
-            if (   rcStrict == VINF_SUCCESS
-                || rcStrict == VINF_GIM_HYPERCALL_CONTINUING)
-                return VINF_SUCCESS;
-            AssertMsgReturn(rcStrict == VINF_GIM_R3_HYPERCALL, ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)), VERR_IEM_IPE_4);
-            return rcStrict;
-        }
-        AssertMsgReturn(   rcStrict == VERR_GIM_HYPERCALL_ACCESS_DENIED
-                        || rcStrict == VERR_GIM_HYPERCALLS_NOT_AVAILABLE
-                        || rcStrict == VERR_GIM_NOT_ENABLED
-                        || rcStrict == VERR_GIM_HYPERCALL_MEMORY_READ_FAILED
-                        || rcStrict == VERR_GIM_HYPERCALL_MEMORY_WRITE_FAILED,
-                        ("%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)), VERR_IEM_IPE_4);
+    /** @todo intercept. */
 
-        /* Raise #UD on all failures. */
-    }
-    return iemRaiseUndefinedOpcode(pVCpu);
+    /* Join forces with vmmcall. */
+    return IEM_CIMPL_CALL_0(iemCImpl_Hypercall);
 }