Changeset 47454 in vbox for trunk/src/VBox

Timestamp:

Jul 29, 2013 11:03:11 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Make save-DR7 function name more clear (addressed a todo).

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (6 diffs)

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

@@ -5622 +5622 @@
 
 /**
- * Saves the guest debug registers from the current VMCS into the guest-CPU
+ * Saves the guest debug-register DR7 from the current VMCS into the guest-CPU
  * context.
  *
@@ -5632 +5632 @@
  *
  * @remarks No-long-jump zone!!!
- * @todo r=bird: Why is this plural when it only saves DR7?  I almost jumped to
- *       the wrong conclusions looking at the I/O code just now (it most likely
- *       only needs DR7).
- */
-static int hmR0VmxSaveGuestDebugRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+ */
+static int hmR0VmxSaveGuestDR7(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_DEBUG))
@@ -5708 +5705 @@
     AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestTableRegs failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
 
-    rc = hmR0VmxSaveGuestDebugRegs(pVCpu, pMixedCtx);
-    AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestDebugRegs failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
+    rc = hmR0VmxSaveGuestDR7(pVCpu, pMixedCtx);
+    AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestDR7 failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
 
     rc = hmR0VmxSaveGuestSysenterMsrs(pVCpu, pMixedCtx);
@@ -5727 +5724 @@
 
     rc = hmR0VmxSaveGuestApicState(pVCpu, pMixedCtx);
-    AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestDebugRegs failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
+    AssertLogRelMsgRCReturn(rc, ("hmR0VmxSaveGuestApicState failed! rc=%Rrc (pVCpu=%p)\n", rc, pVCpu), rc);
 
     AssertMsg(pVCpu->hm.s.vmx.fUpdatedGuestState == HMVMX_UPDATED_GUEST_ALL,
@@ -8516 +8513 @@
              *        breakpoints.  The whole host & guest debugger stuff needs to be
              *        looked over at some point.  For now, it's just best effort. */
-            rc = hmR0VmxSaveGuestDebugRegs(pVCpu, pMixedCtx);      /* For DR7. */
+            rc = hmR0VmxSaveGuestDR7(pVCpu, pMixedCtx);
             AssertRCReturn(rc, rc);
             uint32_t const uDr7 = pMixedCtx->dr[7];
@@ -9032 +9029 @@
             ASMSetDR6(pMixedCtx->dr[6]);
 
-        rc = hmR0VmxSaveGuestDebugRegs(pVCpu, pMixedCtx);
+        rc = hmR0VmxSaveGuestDR7(pVCpu, pMixedCtx);
 
         /* X86_DR7_GD will be cleared if DRx accesses should be trapped inside the guest. */