Changeset 80812 in vbox for trunk/src

Timestamp:

Sep 16, 2019 6:40:41 AM (5 years ago)

Author:

vboxsync

Message:

VMM/EM: Nested VMX: bugref:9180 Use CPUMIsGuestVmxInterceptEvents.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (3 diffs)

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

@@ -2084 +2084 @@
                 {
                     Assert(CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_NMI_WINDOW_EXIT));
-                    Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents);
+                    Assert(CPUMIsGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx));
                     rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexit(pVCpu, VMX_EXIT_NMI_WINDOW, 0 /* uExitQual */));
                     AssertMsg(   rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE
@@ -2149 +2149 @@
                 {
                     Assert(CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT));
-                    Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents);
+                    Assert(CPUMIsGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx));
                     rc2 = VBOXSTRICTRC_VAL(IEMExecVmxVmexit(pVCpu, VMX_EXIT_INT_WINDOW, 0 /* uExitQual */));
                     AssertMsg(   rc2 != VINF_VMX_INTERCEPT_NOT_ACTIVE
@@ -2194 +2194 @@
                             CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_XCPT_MASK);
                             /** @todo this really isn't nice, should properly handle this */
+                            /* Note! This can still cause a VM-exit (on Intel). */
                             rc2 = TRPMR3InjectEvent(pVM, pVCpu, TRPM_HARDWARE_INT, &fInjected);
                             fWakeupPending = true;