Changeset 72620 in vbox

Timestamp:

Jun 20, 2018 9:53:34 AM (7 years ago)

Author:

vboxsync

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

123120

Message:

HMVMXR0.cpp: Retry new RDTSC and RDTSCP code with HM_CHANGED_XXXX flags set (duh). bugref:6973

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -11917 +11917 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS();
-#if 0 /** @todo Needs testing. @bugref{6973} */
+#if 1 /** @todo Needs testing. @bugref{6973} */
     int rc = hmR0VmxSaveGuestCR4(pVCpu, pMixedCtx);      /* Needed for CPL < 0 only, really. */
     rc    |= hmR0VmxSaveGuestRegsForIemExec(pVCpu, pMixedCtx, false /*fMemory*/, false /*fNeedRsp*/);
@@ -11929 +11929 @@
             pVmxTransient->fUpdateTscOffsettingAndPreemptTimer = true;
     }
-    else if (rcStrict == VINF_EM_RESCHEDULE)
+    else if (rcStrict == VINF_IEM_RAISED_XCPT)
         rcStrict = VINF_SUCCESS;
+    HMCPU_CF_SET(pVCpu, rcStrict != VINF_IEM_RAISED_XCPT ? HM_CHANGED_GUEST_RIP | HM_CHANGED_GUEST_RFLAGS : HM_CHANGED_ALL_GUEST);
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtsc);
     return rcStrict;
@@ -11961 +11962 @@
 {
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS();
-#if 0 /** @todo Needs testing. @bugref{6973} */
+#if 1 /** @todo Needs testing. @bugref{6973} */
     int rc = hmR0VmxSaveGuestCR4(pVCpu, pMixedCtx);      /* Needed for CPL < 0 only, really. */
     rc    |= hmR0VmxSaveGuestRegsForIemExec(pVCpu, pMixedCtx, false /*fMemory*/, false /*fNeedRsp*/);
@@ -11974 +11975 @@
             pVmxTransient->fUpdateTscOffsettingAndPreemptTimer = true;
     }
-    else if (rcStrict == VINF_EM_RESCHEDULE)
+    else if (rcStrict == VINF_IEM_RAISED_XCPT)
         rcStrict = VINF_SUCCESS;
+    HMCPU_CF_SET(pVCpu, rcStrict != VINF_IEM_RAISED_XCPT ? HM_CHANGED_GUEST_RIP | HM_CHANGED_GUEST_RFLAGS : HM_CHANGED_ALL_GUEST);
     STAM_COUNTER_INC(&pVCpu->hm.s.StatExitRdtscp);
     return rcStrict;