Changeset 96823 in vbox

Timestamp:

Sep 22, 2022 5:08:44 AM (2 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:10092 Restricted iemVmxVmexitInstrNeedsInfo's checking of allowed instructions to debug builds since no call is dependent on runtime info.

File:

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

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

@@ -2831 +2831 @@
     ExitInfo.cbInstr = cbInstr;
 
-    /*
-     * Update the Exit qualification field with displacement bytes.
-     * See Intel spec. 27.2.1 "Basic VM-Exit Information".
+#ifdef VBOX_STRICT
+    /*
+    * To prevent us from shooting ourselves in the foot.
+    * The follow instructions convey specific info that require using their respective handlers.
      */
     switch (uExitReason)
@@ -2852 +2853 @@
         case VMX_EXIT_RDRAND:
         case VMX_EXIT_RDSEED:
-        {
-            /* Construct the VM-exit instruction information. */
-            RTGCPTR GCPtrDisp;
-            uint32_t const uInstrInfo = iemVmxGetExitInstrInfo(pVCpu, uExitReason, uInstrId, &GCPtrDisp);
-
-            /* Update the VM-exit instruction information. */
-            ExitInfo.InstrInfo.u = uInstrInfo;
-
-            /* Update the Exit qualification. */
-            ExitInfo.u64Qual = GCPtrDisp;
             break;
-        }
-
         default:
             AssertMsgFailedReturn(("Use instruction-specific handler\n"), VERR_IEM_IPE_5);
             break;
     }
+#endif
+
+    /*
+     * Update the Exit qualification field with displacement bytes.
+     * See Intel spec. 27.2.1 "Basic VM-Exit Information".
+     */
+    /* Construct the VM-exit instruction information. */
+    RTGCPTR GCPtrDisp;
+    uint32_t const uInstrInfo = iemVmxGetExitInstrInfo(pVCpu, uExitReason, uInstrId, &GCPtrDisp);
+
+    /* Update the VM-exit instruction information. */
+    ExitInfo.InstrInfo.u = uInstrInfo;
+
+    /* Update the Exit qualification. */
+    ExitInfo.u64Qual = GCPtrDisp;
 
     return iemVmxVmexitInstrWithInfo(pVCpu, &ExitInfo);