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

Timestamp:

Nov 27, 2018 7:10:10 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested SVM: bugref:7243 Remove super confusing virtual-GIF vs GIF handling.

File:

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

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

@@ -1825 +1825 @@
     *pfInjected      = false;
 
-    PVM pVM  = pVCpu->CTX_SUFF(pVM);
-    Assert(pVCpu->cpum.GstCtx.hwvirt.fGif);
-    bool fVirtualGif = CPUMGetSvmNstGstVGif(&pVCpu->cpum.GstCtx);
+    PVM  pVM  = pVCpu->CTX_SUFF(pVM);
+    bool fGif = pVCpu->cpum.GstCtx.hwvirt.fGif;
 #ifdef VBOX_WITH_RAW_MODE
-    fVirtualGif     &= !PATMIsPatchGCAddr(pVM, pVCpu->cpum.GstCtx.eip);
-#endif
-    if (fVirtualGif)
+    fGif &= !PATMIsPatchGCAddr(pVM, pVCpu->cpum.GstCtx.eip);
+#endif
+    if (fGif)
     {
         if (CPUMCanSvmNstGstTakePhysIntr(pVCpu, &pVCpu->cpum.GstCtx))