Index: /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 65105)
+++ /trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp	(revision 65106)
@@ -2639,4 +2639,8 @@
  * Sets up the initial exception bitmap in the VMCS based on static conditions.
  *
+ * We shall setup those exception intercepts that don't change during the
+ * lifetime of the VM here. The rest are done dynamically while loading the
+ * guest state.
+ *
  * @returns VBox status code.
  * @param   pVM         The cross context VM structure.
@@ -2650,7 +2654,5 @@
     LogFlowFunc(("pVM=%p pVCpu=%p\n", pVM, pVCpu));
 
-    /** @todo r=ramshankar: Shouldn't setting up \#UD intercepts be handled by
-     *        hmR0VmxLoadGuestXcptIntercepts()? Why do we check it here? */
-    uint32_t u32XcptBitmap = pVCpu->hm.s.fGIMTrapXcptUD ? RT_BIT(X86_XCPT_UD) : 0;
+    uint32_t u32XcptBitmap = 0;
 
     /* Must always intercept #AC to prevent the guest from hanging the CPU. */