Index: /trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h	(revision 78444)
+++ /trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h	(revision 78445)
@@ -170,20 +170,13 @@
  *  VMX_EXIT_IO_SMI
  *  VMX_EXIT_SMI
- *  VMX_EXIT_INT_WINDOW
- *  VMX_EXIT_NMI_WINDOW
  *  VMX_EXIT_GETSEC
  *  VMX_EXIT_RSM
- *  VMX_EXIT_MTF
  *  VMX_EXIT_MONITOR (APIC access VM-exit caused by MONITOR pending)
- *  VMX_EXIT_ERR_MACHINE_CHECK
- *  VMX_EXIT_TPR_BELOW_THRESHOLD
+ *  VMX_EXIT_ERR_MACHINE_CHECK (we never need to raise this?)
  *  VMX_EXIT_APIC_ACCESS
- *  VMX_EXIT_VIRTUALIZED_EOI
  *  VMX_EXIT_EPT_VIOLATION
  *  VMX_EXIT_EPT_MISCONFIG
  *  VMX_EXIT_INVEPT
- *  VMX_EXIT_PREEMPT_TIMER
  *  VMX_EXIT_INVVPID
- *  VMX_EXIT_APIC_WRITE
  *  VMX_EXIT_RDRAND
  *  VMX_EXIT_VMFUNC
@@ -1084,5 +1077,5 @@
 DECL_FORCE_INLINE(void) iemVmxVmSucceed(PVMCPU pVCpu)
 {
-    return CPUMSetGuestVmxVmSucceed(IEM_GET_CTX(pVCpu));
+    return CPUMSetGuestVmxVmSucceed(&pVCpu->cpum.GstCtx);
 }
 
@@ -1095,5 +1088,5 @@
 DECL_FORCE_INLINE(void) iemVmxVmFailInvalid(PVMCPU pVCpu)
 {
-    return CPUMSetGuestVmxVmFailInvalid(IEM_GET_CTX(pVCpu));
+    return CPUMSetGuestVmxVmFailInvalid(&pVCpu->cpum.GstCtx);
 }
 
@@ -1107,5 +1100,5 @@
 DECL_FORCE_INLINE(void) iemVmxVmFailValid(PVMCPU pVCpu, VMXINSTRERR enmInsErr)
 {
-    return CPUMSetGuestVmxVmFailValid(IEM_GET_CTX(pVCpu), enmInsErr);
+    return CPUMSetGuestVmxVmFailValid(&pVCpu->cpum.GstCtx, enmInsErr);
 }
 
@@ -1119,5 +1112,5 @@
 DECL_FORCE_INLINE(void) iemVmxVmFail(PVMCPU pVCpu, VMXINSTRERR enmInsErr)
 {
-    return CPUMSetGuestVmxVmFail(IEM_GET_CTX(pVCpu), enmInsErr);
+    return CPUMSetGuestVmxVmFail(&pVCpu->cpum.GstCtx, enmInsErr);
 }
 
@@ -2776,5 +2769,5 @@
     pVmcs->u32RoExitReason = uExitReason;
     Log3(("vmexit: uExitReason=%#RX32 uExitQual=%#RX64 cs:rip=%04x:%#RX64\n", uExitReason, pVmcs->u64RoExitQual,
-          IEM_GET_CTX(pVCpu)->cs.Sel,  IEM_GET_CTX(pVCpu)->rip));
+          pVCpu->cpum.GstCtx.cs.Sel, pVCpu->cpum.GstCtx.rip));
 
     /*