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

Timestamp:

Sep 29, 2018 2:37:16 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 VM-exit intercept for CPUID.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

-              r74520
+              r74532
  * Check if the guest has entered VMX root operation.
  */
 #define IEM_VMX_IS_ROOT_MODE(a_pVCpu)                        (CPUMIsGuestInVmxRootMode(IEM_GET_CTX(a_pVCpu)))
+# define IEM_VMX_IS_ROOT_MODE(a_pVCpu)                              (CPUMIsGuestInVmxRootMode(IEM_GET_CTX(a_pVCpu)))
 /**
  * Check if the guest has entered VMX non-root operation.
  */
+#define IEM_VMX_IS_NON_ROOT_MODE(a_pVCpu)                    (CPUMIsGuestInVmxNonRootMode(IEM_GET_CTX(a_pVCpu)))
+# define IEM_VMX_IS_NON_ROOT_MODE(a_pVCpu)                          (CPUMIsGuestInVmxNonRootMode(IEM_GET_CTX(a_pVCpu)))
+/**
+ * Invokes the VMX VM-exit handler for an instruction intercept.
+ */
+# define IEM_VMX_VMEXIT_INSTR_RET(a_pVCpu, a_uExitReason, a_cbInstr) \
+    do { return iemVmxVmexitInstr((a_pVCpu), (a_uExitReason), (a_cbInstr)); } while (0)
 #else
 # define IEM_VMX_IS_ROOT_MODE(a_pVCpu)                       (false)
 # define IEM_VMX_IS_NON_ROOT_MODE(a_pVCpu)                   (false)
+# define IEM_VMX_IS_ROOT_MODE(a_pVCpu)                              (false)
+# define IEM_VMX_IS_NON_ROOT_MODE(a_pVCpu)                          (false)
+# define IEM_VMX_VMEXIT_INSTR_RET(a_pVCpu, a_Reason, a_cbInstr)     do { return VERR_VMX_IPE_1; } while (0)
 #endif

-              r74522
+              r74532
+    }
+    if (IEM_VMX_IS_NON_ROOT_MODE(pVCpu))
+    {
+        Log2(("cpuid: Guest intercept -> VM-exit\n"));
+        IEM_VMX_VMEXIT_INSTR_RET(pVCpu, VMX_EXIT_CPUID, cbInstr);
+    }
     CPUMGetGuestCpuId(pVCpu, pVCpu->cpum.GstCtx.eax, pVCpu->cpum.GstCtx.ecx,
                       &pVCpu->cpum.GstCtx.eax, &pVCpu->cpum.GstCtx.ebx, &pVCpu->cpum.GstCtx.ecx, &pVCpu->cpum.GstCtx.edx);

Note: See TracChangeset for help on using the changeset viewer.