Changeset 71416 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 21, 2018 9:30:14 AM (7 years ago)

Author:

vboxsync

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

121383

Message:

VMM/IEM: Nested Hw.virt: Fix exitinfo1 field for SVM_CTRL_INTERCEPT_CR0_SEL_WRITE intercept.

File:

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

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

@@ -5247 +5247 @@
                 IEM_RETURN_SVM_CRX_VMEXIT(pVCpu, SVM_EXIT_WRITE_CR0, enmAccessCrX, iGReg);
             }
-            if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_CR0_SEL_WRITES))
+            if (IEM_IS_SVM_CTRL_INTERCEPT_SET(pVCpu, SVM_CTRL_INTERCEPT_CR0_SEL_WRITE))
             {
                 /* 'lmsw' intercepts regardless of whether the TS/MP bits are actually toggled. */
@@ -5254 +5254 @@
                 {
                     Assert(enmAccessCrX != IEMACCESSCRX_CLTS);
-                    Log(("iemCImpl_load_Cr%#x: TS/MP bit changed or lmsw instr: Guest intercept -> #VMEXIT\n", iCrReg));
+                    Log(("iemCImpl_load_Cr%#x: lmsw or bits other than TS/MP changed: Guest intercept -> #VMEXIT\n", iCrReg));
                     IEM_SVM_UPDATE_NRIP(pVCpu);
-                    IEM_RETURN_SVM_VMEXIT(pVCpu, SVM_EXIT_CR0_SEL_WRITE, 0 /* uExitInfo1 */, 0 /* uExitInfo2 */);
+                    IEM_RETURN_SVM_CRX_VMEXIT(pVCpu, SVM_EXIT_CR0_SEL_WRITE, enmAccessCrX, iGReg);
                 }
             }