Changeset 78445 in vbox for trunk/src/VBox

Timestamp:

May 8, 2019 8:37:27 AM (6 years ago)

Author:

vboxsync

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

130447

Message:

VMM/IEM: Nested VMX: bugref:9180 Todo update and nits.

File:

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

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

@@ -170 +170 @@
  *  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 +1077 @@
 DECL_FORCE_INLINE(void) iemVmxVmSucceed(PVMCPU pVCpu)
 {
-    return CPUMSetGuestVmxVmSucceed(IEM_GET_CTX(pVCpu));
+    return CPUMSetGuestVmxVmSucceed(&pVCpu->cpum.GstCtx);
 }
 
@@ -1095 +1088 @@
 DECL_FORCE_INLINE(void) iemVmxVmFailInvalid(PVMCPU pVCpu)
 {
-    return CPUMSetGuestVmxVmFailInvalid(IEM_GET_CTX(pVCpu));
+    return CPUMSetGuestVmxVmFailInvalid(&pVCpu->cpum.GstCtx);
 }
 
@@ -1107 +1100 @@
 DECL_FORCE_INLINE(void) iemVmxVmFailValid(PVMCPU pVCpu, VMXINSTRERR enmInsErr)
 {
-    return CPUMSetGuestVmxVmFailValid(IEM_GET_CTX(pVCpu), enmInsErr);
+    return CPUMSetGuestVmxVmFailValid(&pVCpu->cpum.GstCtx, enmInsErr);
 }
 
@@ -1119 +1112 @@
 DECL_FORCE_INLINE(void) iemVmxVmFail(PVMCPU pVCpu, VMXINSTRERR enmInsErr)
 {
-    return CPUMSetGuestVmxVmFail(IEM_GET_CTX(pVCpu), enmInsErr);
+    return CPUMSetGuestVmxVmFail(&pVCpu->cpum.GstCtx, enmInsErr);
 }
 
@@ -2776 +2769 @@
     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));
 
     /*