Changeset 69819 in vbox

Timestamp:

Nov 24, 2017 5:27:07 AM (7 years ago)

Author:

vboxsync

Message:

VMM: Nested Hw.virt: bits.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (3 diffs)
• VMMR0/HMSVMR0.cpp (modified) (3 diffs)

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

@@ -2552 +2552 @@
  *
  * @param   pCtx        The guest-CPU context.
+ *
+ * @sa      hmR0SvmCanNstGstTakePhysIntr.
  */
 VMM_INT_DECL(bool) CPUMCanSvmNstGstTakePhysIntr(PCCPUMCTX pCtx)
@@ -2591 +2593 @@
 #else
     Assert(CPUMIsGuestInSvmNestedHwVirtMode(pCtx));
+    Assert(pCtx->hwvirt.svm.fGif);
 
     PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
@@ -2598 +2601 @@
 
     if (!pCtx->rflags.Bits.u1IF)
-        return false;
-
-    if (!pCtx->hwvirt.svm.fGif)
         return false;
 

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

@@ -2737 +2737 @@
     {
         pCtx->cr2 = uFaultAddress;
+        /* The VMCB clean bit for CR2 will be updated while re-loading the guest state. */
         HMCPU_CF_SET(pVCpu, HM_CHANGED_GUEST_CR2);
     }
@@ -3052 +3053 @@
  *          nested-guest VMCB which may have been suitably modified for executing
  *          using hardware-assisted SVM.
+ *
+ * @sa      CPUMCanSvmNstGstTakePhysIntr.
  */
 static bool hmR0SvmCanNstGstTakePhysIntr(PVMCPU pVCpu, PCCPUMCTX pCtx)
@@ -3179 +3182 @@
          * nested-guest VMCB interrupt control fields besides V_INTR_MASKING, see hmR0SvmVmRunCacheVmcb.
          */
-        if (   (pVmcbNstGstCache->u64InterceptCtrl & SVM_CTRL_INTERCEPT_VINTR)
-            && VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST)
+        if (   VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INTERRUPT_NESTED_GUEST)
+            && (pVmcbNstGstCache->u64InterceptCtrl & SVM_CTRL_INTERCEPT_VINTR)
             && CPUMCanSvmNstGstTakeVirtIntr(pCtx))
         {