Changeset 80810 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 16, 2019 6:38:37 AM (5 years ago)

Author:

vboxsync

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

133377

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Use CPUM[Is|Set]GuestVmxInterceptEvents. Added comment regarding TRPM and intercepting events in the nested-guest.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -10346 +10346 @@
      * guest to cause a VM-exit the next time they are ready to receive the event.
      *
-     * With nested-guests, evaluating pending events may cause VM-exits.
+     * With nested-guests, evaluating pending events may cause VM-exits. Also, verify
+     * that the event in TRPM that we will inject using hardware-assisted VMX is -not-
+     * subject to interecption. Otherwise, we should have checked and injected them
+     * manually elsewhere (IEM).
      */
     if (TRPMHasTrap(pVCpu))
     {
-        Assert(!pVmxTransient->fIsNestedGuest || !pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents);
+        Assert(!pVmxTransient->fIsNestedGuest || !CPUMIsGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx));
         hmR0VmxTrpmTrapToPendingEvent(pVCpu);
     }
@@ -10473 +10476 @@
              */
             if (pVmxTransient->fIsNestedGuest)
-                pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents = true;
+                CPUMSetGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx, true);
 #endif