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

Timestamp:

Jul 17, 2019 5:56:00 PM (6 years ago)

Author:

vboxsync

Message:

VMM/TRPM: Nested VMX: bugref:9180 Fix assertion for guest hypervisors that use "acknowledge interrupt on exit" control.

File:

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

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

@@ -1499 +1499 @@
 VMMR3DECL(int) TRPMR3InjectEvent(PVM pVM, PVMCPU pVCpu, TRPMEVENT enmEvent, bool *pfInjected)
 {
+    PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVCpu);
 #ifdef VBOX_WITH_RAW_MODE
-    PCPUMCTX pCtx = CPUMQueryGuestCtxPtr(pVCpu);
     Assert(!PATMIsPatchGCAddr(pVM, pCtx->eip));
 #endif
@@ -1517 +1517 @@
 # endif
 
-    Assert(!CPUMIsGuestInNestedHwvirtMode(pCtx));
+    Assert(  !CPUMIsGuestInNestedHwvirtMode(pCtx)
+           || CPUMIsGuestVmxExitCtlsSet(pVCpu, pCtx, VMX_EXIT_CTLS_ACK_EXT_INT));
     uint8_t u8Interrupt = 0;
     int rc = PDMGetInterrupt(pVCpu, &u8Interrupt);
@@ -1586 +1587 @@
 
 #else  /* !TRPM_FORWARD_TRAPS_IN_GC */
-    RT_NOREF(pVM, enmEvent);
+    RT_NOREF3(pVM, enmEvent, pCtx);
     uint8_t u8Interrupt = 0;
     int rc = PDMGetInterrupt(pVCpu, &u8Interrupt);