Changeset 69819 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

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

Author:

vboxsync

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

119243

Message:

VMM: Nested Hw.virt: bits.

File:

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

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))
         {