Changeset 94844 in vbox

Timestamp:

May 5, 2022 10:49:39 AM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM,HM: Added a VBOX_WITH_IEM_TLB makefile config variable for quickly enabling/disabling the TLB; fixed associated compilation issue in the VMX code. bugref:9898

Location:

trunk/src/VBox/VMM

Files:

• Config.kmk (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/Config.kmk

@@ -36 +36 @@
  VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_SVM
 endif
-ifdef VBOX_WITH_NESTED_HWVIRT_VMX
- VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_VMX
-endif
-ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
- VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_VMX_EPT
-endif
-ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
- VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+ifdef VBOX_WITH_IEM_TLB ## @todo VMX code doesn't compile with TLBs enabled.
+  VMM_COMMON_DEFS += IEM_WITH_CODE_TLB IEM_WITH_DATA_TLB
+else
+ ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+  VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_VMX
+ endif
+ ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+  VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_VMX_EPT
+ endif
+ ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+  VMM_COMMON_DEFS += VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
+ endif
 endif
 # part of global DEFS

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -4917 +4917 @@
         if (fWhat & HMVMX_READ_GUEST_PENDING_DBG_XCPTS)
         {
+            fWhat &= ~HMVMX_READ_GUEST_PENDING_DBG_XCPTS;
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
             vmxHCReadGuestPendingDbgXctps(pVCpu, pVmxTransient);
-            fWhat &= ~HMVMX_READ_GUEST_PENDING_DBG_XCPTS;
             pVmxExitAux->u64GuestPendingDbgXcpts = pVmxTransient->uGuestPendingDbgXcpts;
+#else
+            pVmxExitAux->u64GuestPendingDbgXcpts = 0;
+#endif
         }