Changeset 80454 in vbox

Timestamp:

Aug 28, 2019 4:31:26 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132945

Message:

VMM/HMSVMR0: Spaces.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (9 diffs)

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

@@ -965 +965 @@
     /* If you add any exceptions here, make sure to update hmR0SvmHandleExit(). */
     pVmcbCtrl0->u32InterceptXcpt |= RT_BIT_32(X86_XCPT_BP)
-                                  | RT_BIT_32(X86_XCPT_DE)
-                                  | RT_BIT_32(X86_XCPT_NM)
-                                  | RT_BIT_32(X86_XCPT_UD)
-                                  | RT_BIT_32(X86_XCPT_NP)
-                                  | RT_BIT_32(X86_XCPT_SS)
-                                  | RT_BIT_32(X86_XCPT_GP)
-                                  | RT_BIT_32(X86_XCPT_PF)
-                                  | RT_BIT_32(X86_XCPT_MF)
-                                  ;
+                                 | RT_BIT_32(X86_XCPT_DE)
+                                 | RT_BIT_32(X86_XCPT_NM)
+                                 | RT_BIT_32(X86_XCPT_UD)
+                                 | RT_BIT_32(X86_XCPT_NP)
+                                 | RT_BIT_32(X86_XCPT_SS)
+                                 | RT_BIT_32(X86_XCPT_GP)
+                                 | RT_BIT_32(X86_XCPT_PF)
+                                 | RT_BIT_32(X86_XCPT_MF)
+                                 ;
 #endif
 
@@ -997 +997 @@
     if (!fUseVirtVmsaveVmload)
         pVmcbCtrl0->u64InterceptCtrl |= SVM_CTRL_INTERCEPT_VMSAVE
-                                      | SVM_CTRL_INTERCEPT_VMLOAD;
+                                     |  SVM_CTRL_INTERCEPT_VMLOAD;
 
     /* Virtual GIF. */
@@ -1003 +1003 @@
     if (!fUseVGif)
         pVmcbCtrl0->u64InterceptCtrl |= SVM_CTRL_INTERCEPT_CLGI
-                                      | SVM_CTRL_INTERCEPT_STGI;
+                                     |  SVM_CTRL_INTERCEPT_STGI;
 #endif
 
@@ -1041 +1041 @@
         /* Intercept INVLPG and task switches (may change CR3, EFLAGS, LDT). */
         pVmcbCtrl0->u64InterceptCtrl |= SVM_CTRL_INTERCEPT_INVLPG
-                                      | SVM_CTRL_INTERCEPT_TASK_SWITCH;
+                                     |  SVM_CTRL_INTERCEPT_TASK_SWITCH;
 
         /* Page faults must be intercepted to implement shadow paging. */
@@ -1445 +1445 @@
     {
         uShadowCr0 |= X86_CR0_PG      /* Use shadow page tables. */
-                    |  X86_CR0_WP;    /* Guest CPL 0 writes to its read-only pages should cause a #PF #VMEXIT. */
+                   |  X86_CR0_WP;     /* Guest CPL 0 writes to its read-only pages should cause a #PF #VMEXIT. */
     }
 
@@ -2123 +2123 @@
 #ifndef HMSVM_ALWAYS_TRAP_ALL_XCPTS
     pVmcbNstGstCtrl->u32InterceptXcpt  |= pVmcb->ctrl.u32InterceptXcpt
-                                        & ~(  RT_BIT(X86_XCPT_UD)
-                                            | RT_BIT(X86_XCPT_BP)
-                                            | (pVCpu->hm.s.fTrapXcptGpForLovelyMesaDrv ? RT_BIT(X86_XCPT_GP) : 0));
+                                       & ~(  RT_BIT(X86_XCPT_UD)
+                                           | RT_BIT(X86_XCPT_BP)
+                                           | (pVCpu->hm.s.fTrapXcptGpForLovelyMesaDrv ? RT_BIT(X86_XCPT_GP) : 0));
 #else
     pVmcbNstGstCtrl->u32InterceptXcpt  |= pVmcb->ctrl.u32InterceptXcpt;
@@ -2142 +2142 @@
     pVmcbNstGstCtrl->u64InterceptCtrl  |= (pVmcb->ctrl.u64InterceptCtrl & ~(  SVM_CTRL_INTERCEPT_VINTR
                                                                             | SVM_CTRL_INTERCEPT_VMMCALL))
-                                        | HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS;
+                                       |  HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS;
 
     Assert(   (pVmcbNstGstCtrl->u64InterceptCtrl & HMSVM_MANDATORY_GUEST_CTRL_INTERCEPTS)
@@ -2505 +2505 @@
         if (!pVCpu->CTX_SUFF(pVM)->cpum.ro.GuestFeatures.fSvmVirtVmsaveVmload)
             pVmcbNstGstCtrl->u64InterceptCtrl |= SVM_CTRL_INTERCEPT_VMSAVE
-                                               |  SVM_CTRL_INTERCEPT_VMLOAD;
+                                              |  SVM_CTRL_INTERCEPT_VMLOAD;
 
         /*
@@ -2513 +2513 @@
         if (!pVCpu->CTX_SUFF(pVM)->cpum.ro.GuestFeatures.fSvmVGif)
             pVmcbNstGstCtrl->u64InterceptCtrl |= SVM_CTRL_INTERCEPT_CLGI
-                                               |  SVM_CTRL_INTERCEPT_STGI;
+                                              |  SVM_CTRL_INTERCEPT_STGI;
 
         /* Merge the guest and nested-guest intercepts. */