Index: /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp	(revision 27443)
+++ /trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp	(revision 27444)
@@ -2998,9 +2998,11 @@
                 if (rc == VINF_EM_RAW_GUEST_TRAP)
                 {
-                    /** @todo this isn't working, but we'll never get here normally. */
-
                     /* Update DR6 here. */
                     pCtx->dr[6]  = uDR6;
 
+                    /* Resync DR6 if the debug state is active. */
+                    if (CPUMIsGuestDebugStateActive(pVCpu))
+                        ASMSetDR6(pCtx->dr[6]);
+                        
                     /* X86_DR7_GD will be cleared if drx accesses should be trapped inside the guest. */
                     pCtx->dr[7] &= ~X86_DR7_GD;