Changeset 80809 in vbox

Timestamp:

Sep 16, 2019 6:33:32 AM (5 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Use CPUM[Is|Set]GuestVmxInterceptEvents and fix assertion for 'acknowledge external interrupt on VM-exit' case. Logging space nit.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -2535 +2535 @@
 
     /* We should not cause an NMI-window/interrupt-window VM-exit when injecting events as part of VM-entry. */
-    if (!pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents)
+    if (!CPUMIsGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx))
     {
         Assert(uExitReason != VMX_EXIT_NMI_WINDOW);
@@ -3515 +3515 @@
     PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(pVmcs);
-    Assert(fIntPending || uVector == 0);
+    Assert(!fIntPending || uVector == 0);
 
     /** @todo NSTVMX: r=ramshankar: Consider standardizing check basic/blanket
@@ -3653 +3653 @@
      * See Intel spec. 26.5.1.2 "VM Exits During Event Injection".
      */
-    if (!pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents)
+    if (!CPUMIsGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx))
     {
         /*
@@ -3668 +3668 @@
             Assert(!pVCpu->cpum.GstCtx.hwvirt.vmx.fVirtNmiBlocking);
 
-        pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents = true;
+        CPUMSetGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx, true);
         return VINF_VMX_INTERCEPT_NOT_ACTIVE;
     }
@@ -7117 +7117 @@
     bool const     fEntryIntInfoValid = VMX_ENTRY_INT_INFO_IS_VALID(uEntryIntInfo);
 
-    pVCpu->cpum.GstCtx.hwvirt.vmx.fInterceptEvents = !fEntryIntInfoValid;
+    CPUMSetGuestVmxInterceptEvents(&pVCpu->cpum.GstCtx, !fEntryIntInfoValid);
     if (fEntryIntInfoValid)
     {
@@ -7443 +7443 @@
                                 /* Finally, done. */
                                 Log3(("%s: cs:rip=%#04x:%#RX64 cr0=%#RX64 (%#RX64) cr4=%#RX64 (%#RX64) efer=%#RX64\n",
-                                     pszInstr, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
-                                     pVmcs->u64Cr0ReadShadow.u, pVCpu->cpum.GstCtx.cr4, pVmcs->u64Cr4ReadShadow.u,
-                                     pVCpu->cpum.GstCtx.msrEFER));
+                                      pszInstr, pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip, pVCpu->cpum.GstCtx.cr0,
+                                      pVmcs->u64Cr0ReadShadow.u, pVCpu->cpum.GstCtx.cr4, pVmcs->u64Cr4ReadShadow.u,
+                                      pVCpu->cpum.GstCtx.msrEFER));
                                 return VINF_SUCCESS;
                             }