Changeset 71445 in vbox

Timestamp:

Mar 22, 2018 10:40:37 AM (7 years ago)

Author:

vboxsync

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

121414

Message:

VMM/HMSVMR0: Fix FERR_FREEZE intercepts.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (5 diffs)

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

@@ -359 +359 @@
 static FNSVMEXITHANDLER hmR0SvmExitVmmCall;
 static FNSVMEXITHANDLER hmR0SvmExitPause;
+static FNSVMEXITHANDLER hmR0SvmExitFerrFreeze;
 static FNSVMEXITHANDLER hmR0SvmExitIret;
 static FNSVMEXITHANDLER hmR0SvmExitXcptPF;
@@ -5235 +5236 @@
             if (HMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_FERR_FREEZE))
                 return HM_SVM_VMEXIT_NESTED(pVCpu, uExitCode, uExitInfo1, uExitInfo2);
-            return hmR0SvmExitIntr(pVCpu, pCtx, pSvmTransient);
+            return hmR0SvmExitFerrFreeze(pVCpu, pCtx, pSvmTransient);
         }
 
@@ -5526 +5527 @@
             return hmR0SvmExitVIntr(pVCpu, pCtx, pSvmTransient);
 
+        case SVM_EXIT_FERR_FREEZE:
+            return hmR0SvmExitFerrFreeze(pVCpu, pCtx, pSvmTransient);
+
         case SVM_EXIT_INTR:
-        case SVM_EXIT_FERR_FREEZE:
         case SVM_EXIT_NMI:
             return hmR0SvmExitIntr(pVCpu, pCtx, pSvmTransient);
@@ -7235 +7238 @@
 
 /**
+ * \#VMEXIT handler for FERR intercept (SVM_EXIT_FERR_FREEZE). Conditional
+ * \#VMEXIT.
+ */
+HMSVM_EXIT_DECL hmR0SvmExitFerrFreeze(PVMCPU pVCpu, PCPUMCTX pCtx, PSVMTRANSIENT pSvmTransient)
+{
+    HMSVM_VALIDATE_EXIT_HANDLER_PARAMS();
+    Assert(!(pCtx->cr0 & X86_CR0_NE));
+
+    Log4(("hmR0SvmExitFerrFreeze: Raising IRQ 13 in response to #FERR\n"));
+    return PDMIsaSetIrq(pVCpu->CTX_SUFF(pVM), 13 /* u8Irq */, 1 /* u8Level */, 0 /* uTagSrc */);
+}
+
+
+/**
  * \#VMEXIT handler for IRET (SVM_EXIT_IRET). Conditional \#VMEXIT.
  */
@@ -7441 +7458 @@
         if (RT_SUCCESS(rc))
         {
-#ifdef VBOX_WITH_NESTED_HWVIRT
-            if (   CPUMIsGuestInSvmNestedHwVirtMode(pCtx)
-                && HMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_FERR_FREEZE))
-            {
-                return VBOXSTRICTRC_TODO(IEMExecSvmVmexit(pVCpu, SVM_EXIT_FERR_FREEZE, 0, 0));
-            }
-#endif
             /* Convert a #MF into a FERR -> IRQ 13. See @bugref{6117}. */
             rc = PDMIsaSetIrq(pVCpu->CTX_SUFF(pVM), 13 /* u8Irq */, 1 /* u8Level */, 0 /* uTagSrc */);