Changeset 72065 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Apr 30, 2018 6:27:34 AM (7 years ago)

Author:

vboxsync

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

122431

Message:

VMM/SVM: Interrupt injection fixes.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -1674 +1674 @@
     if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
     {
-        PVM  pVM  = pVCpu->CTX_SUFF(pVM);
-        bool fGif = pCtx->hwvirt.fGif;
+        PVM pVM  = pVCpu->CTX_SUFF(pVM);
+        Assert(pCtx->hwvirt.fGif);
+        bool fVirtualGif = CPUMGetSvmNstGstVGif(pCtx);
 #ifdef VBOX_WITH_RAW_MODE
-        fGif &= !PATMIsPatchGCAddr(pVM, pCtx->eip);
-#endif
-        if (fGif)
+        fVirtualGif     &= !PATMIsPatchGCAddr(pVM, pCtx->eip);
+#endif
+        if (fVirtualGif)
         {
             if (CPUMCanSvmNstGstTakePhysIntr(pVCpu, pCtx))