Changeset 42894 in vbox for trunk/src

Timestamp:

Aug 21, 2012 8:00:10 AM (12 years ago)

Author:

vboxsync

Message:

VMM: nits.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWSVMR0.cpp (modified) (4 diffs)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)
• VMMR3/CPUM.cpp (modified) (1 diff)
• VMMR3/PGMSavedState.cpp (modified) (1 diff)
• include/HWACCMInternal.h (modified) (1 diff)

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

@@ -891 +891 @@
         /* Sync the hypervisor debug state now if any breakpoint is armed. */
         if (    CPUMGetHyperDR7(pVCpu) & (X86_DR7_ENABLED_MASK|X86_DR7_GD)
-            &&  !CPUMIsHyperDebugStateActive(pVCpu)
-            &&  !DBGFIsStepping(pVCpu))
+            && !CPUMIsHyperDebugStateActive(pVCpu)
+            && !DBGFIsStepping(pVCpu))
         {
             /* Save the host and load the hypervisor debug state. */
@@ -907 +907 @@
 #endif
         /* Sync the debug state now if any breakpoint is armed. */
-        if (    (pCtx->dr[7] & (X86_DR7_ENABLED_MASK|X86_DR7_GD))
-            &&  !CPUMIsGuestDebugStateActive(pVCpu)
-            &&  !DBGFIsStepping(pVCpu))
+        if (   (pCtx->dr[7] & (X86_DR7_ENABLED_MASK|X86_DR7_GD))
+            && !CPUMIsGuestDebugStateActive(pVCpu)
+            && !DBGFIsStepping(pVCpu))
         {
             STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatDRxArmed);
@@ -2822 +2822 @@
             break;
 
-        switch(pPatch->enmType)
+        switch (pPatch->enmType)
         {
             case HWACCMTPRINSTR_READ:
@@ -2856 +2856 @@
                 break;
 
-        default:
-                AssertMsgFailedReturn(("Unexpected type %d\n", pPatch->enmType), VERR_HMSVM_UNEXPECTED_PATCH_TYPE);
+            default:
+                    AssertMsgFailedReturn(("Unexpected type %d\n", pPatch->enmType), VERR_HMSVM_UNEXPECTED_PATCH_TYPE);
         }
     }

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

@@ -1924 +1924 @@
         if (!pVM->hwaccm.s.fNestedPaging)
         {
-            switch(pVCpu->hwaccm.s.enmShadowMode)
+            switch (pVCpu->hwaccm.s.enmShadowMode)
             {
                 case PGMMODE_REAL:          /* Real mode                 -> emulated using v86 mode */
@@ -4602 +4602 @@
         unsigned uAccessType = VMX_EXIT_QUALIFICATION_APIC_ACCESS_TYPE(exitQualification);
 
-        switch(uAccessType)
+        switch (uAccessType)
         {
             case VMX_APIC_ACCESS_TYPE_LINEAR_READ:

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

@@ -1243 +1243 @@
                                             //| X86_CPUID_AMD_ADVPOWER_EDX_MC
                                             //| X86_CPUID_AMD_ADVPOWER_EDX_HWPSTATE
-#if 0 /* We don't expose X86_CPUID_AMD_ADVPOWER_EDX_TSCINVAR, because newer
-       * Linux kernels blindly assume that the AMD performance counters work
-       * if this is set for 64 bits guests. (Can't really find a CPUID feature
-       * bit for them though.) */
+#if 0
+        /*
+         * We don't expose X86_CPUID_AMD_ADVPOWER_EDX_TSCINVAR, because newer
+         * Linux kernels blindly assume that the AMD performance counters work
+         * if this is set for 64 bits guests. (Can't really find a CPUID feature
+         * bit for them though.)
+         */
                                             | X86_CPUID_AMD_ADVPOWER_EDX_TSCINVAR
 #endif

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

@@ -3280 +3280 @@
  *
  * @returns VBox status code.
- * @param   pVM     Pointer to VM structure.
+ * @param   pVM     Pointer to VM.
  * @param   cbRam   The RAM size.
  */

trunk/src/VBox/VMM/include/HWACCMInternal.h

@@ -632 +632 @@
         /* Number of automatically loaded/restored guest MSRs during the world switch. */
         uint32_t                    cCachedMSRs;
-        uint32_t                    uAlignement;
+        uint32_t                    uAlignment;
 #endif /* VBOX_WITH_AUTO_MSR_LOAD_RESTORE */