Changeset 67712 in vbox for trunk/src/VBox/VMM/VMMR3/EM.cpp

Timestamp:

Jun 30, 2017 6:50:29 AM (8 years ago)

Author:

vboxsync

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

116559

Message:

VMM/EM: Nested Hw.virt: Can't directly inspect eflags when in nested SVM guest mode.

File:

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

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

@@ -1960 +1960 @@
             {
                 bool     fIntrEnabled;
+                PCPUMCTX pCtx = pVCpu->em.s.pCtx;
 #ifdef VBOX_WITH_RAW_MODE
-                fIntrEnabled = PATMAreInterruptsEnabled(pVM);
+                /* We cannot just inspect EFLAGS when nested hw.virt is enabled (see e.g. CPUMCanSvmNstGstTakePhysIntr). */
+                fIntrEnabled = !PATMIsPatchGCAddr(pVM, pCtx->eip);
 #else
                 fIntrEnabled = true;
 #endif
                 /** @todo Can we centralize this under CPUMCanInjectInterrupt()? */
-                PCPUMCTX pCtx = pVCpu->em.s.pCtx;
 #ifdef VBOX_WITH_NESTED_HWVIRT
                 fIntrEnabled &= pCtx->hwvirt.svm.fGif;