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

Timestamp:

May 8, 2013 11:44:31 PM (12 years ago)

Author:

vboxsync

Message:

VMM: nits.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMVMXR0.cpp (modified) (3 diffs)
• VMMR3/HM.cpp (modified) (1 diff)

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

@@ -2922 +2922 @@
                     rc = VMXWriteVmcs64(VMX_VMCS64_GUEST_PDPTE2_FULL, pVCpu->hm.s.aPdpes[2].u);     AssertRCReturn(rc, rc);
                     rc = VMXWriteVmcs64(VMX_VMCS64_GUEST_PDPTE3_FULL, pVCpu->hm.s.aPdpes[3].u);     AssertRCReturn(rc, rc);
-                    AssertRCReturn(rc, rc);
                 }
 
@@ -3148 +3147 @@
     /* Update the processor-based VM-execution controls regarding intercepting MOV DRx instructions. */
     if (fInterceptMovDRx)
-        pVCpu->hm.s.vmx.u32ProcCtls   |= VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT;
+        pVCpu->hm.s.vmx.u32ProcCtls |= VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT;
     else
-        pVCpu->hm.s.vmx.u32ProcCtls   &= ~VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT;
-
-    rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_EXCEPTION_BITMAP,   pVCpu->hm.s.vmx.u32XcptBitmap);
+        pVCpu->hm.s.vmx.u32ProcCtls &= ~VMX_VMCS_CTRL_PROC_EXEC_MOV_DR_EXIT;
+
+    rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_EXCEPTION_BITMAP, pVCpu->hm.s.vmx.u32XcptBitmap);
     AssertRCReturn(rc, rc);
     rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC, pVCpu->hm.s.vmx.u32ProcCtls);
@@ -5269 +5268 @@
     if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_SEGMENT_REGS))
     {
-        int rc = hmR0VmxSaveGuestCR0(pVCpu, pMixedCtx);
-        AssertRCReturn(rc, rc);
-        rc = VMXLOCAL_READ_SEG(CS, cs);
-        AssertRCReturn(rc, rc);
-        rc = VMXLOCAL_READ_SEG(SS, ss);
-        AssertRCReturn(rc, rc);
-        rc = VMXLOCAL_READ_SEG(DS, ds);
-        AssertRCReturn(rc, rc);
-        rc = VMXLOCAL_READ_SEG(ES, es);
-        AssertRCReturn(rc, rc);
-        rc = VMXLOCAL_READ_SEG(FS, fs);
-        AssertRCReturn(rc, rc);
-        rc = VMXLOCAL_READ_SEG(GS, gs);
-        AssertRCReturn(rc, rc);
+        int rc = hmR0VmxSaveGuestCR0(pVCpu, pMixedCtx);   AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(CS, cs);                   AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(SS, ss);                   AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(DS, ds);                   AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(ES, es);                   AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(FS, fs);                   AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(GS, gs);                   AssertRCReturn(rc, rc);
 
         /* Restore segment attributes for real-on-v86 mode hack. */

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -2941 +2941 @@
                     LogRel(("HM: Cpu%d EntryCtls     %#RX32\n", i, pVM->aCpus[i].hm.s.vmx.u32EntryCtls));
                     LogRel(("HM: Cpu%d ExitCtls      %#RX32\n", i, pVM->aCpus[i].hm.s.vmx.u32ExitCtls));
-                    LogRel(("HM: Cpu%d MSRBitmapPhys %RHp\n", i, pVM->aCpus[i].hm.s.vmx.HCPhysMsrBitmap));
+                    LogRel(("HM: Cpu%d MSRBitmapPhys %#RHp\n",  i, pVM->aCpus[i].hm.s.vmx.HCPhysMsrBitmap));
 #ifdef VBOX_WITH_AUTO_MSR_LOAD_RESTORE
-                    LogRel(("HM: Cpu%d GuestMSRPhys  %RHp\n", i, pVM->aCpus[i].hm.s.vmx.HCPhysGuestMsr));
-                    LogRel(("HM: Cpu%d HostMsrPhys   %RHp\n", i, pVM->aCpus[i].hm.s.vmx.HCPhysHostMsr));
-                    LogRel(("HM: Cpu%d cGuestMSRs    %u\n",   i, pVM->aCpus[i].hm.s.vmx.cGuestMsrs));
+                    LogRel(("HM: Cpu%d GuestMSRPhys  %#RHp\n",  i, pVM->aCpus[i].hm.s.vmx.HCPhysGuestMsr));
+                    LogRel(("HM: Cpu%d HostMsrPhys   %#RHp\n",  i, pVM->aCpus[i].hm.s.vmx.HCPhysHostMsr));
+                    LogRel(("HM: Cpu%d cGuestMSRs    %u\n",     i, pVM->aCpus[i].hm.s.vmx.cGuestMsrs));
 #endif
                 }