Changeset 45708 in vbox for trunk/src/VBox

Timestamp:

Apr 24, 2013 2:51:55 PM (12 years ago)

Author:

vboxsync

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

85254

Message:

SELM: nits

File:

• trunk/src/VBox/VMM/VMMR3/SELM.cpp (modified) (9 diffs)

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

@@ -915 +915 @@
     }
 
-#ifdef VBOX_WITH_SAFE_STR
+# ifdef VBOX_WITH_SAFE_STR
     /* Use the guest's TR selector to plug the str virtualization hole. */
     if (CPUMGetGuestTR(pVCpu, NULL) != 0)
@@ -922 +922 @@
         aHyperSel[SELM_HYPER_SEL_TSS] = CPUMGetGuestTR(pVCpu, NULL);
     }
-#endif
+# endif
 
     /*
@@ -961 +961 @@
         VMR3Relocate(pVM, 0);
     }
-    else 
-#ifdef VBOX_WITH_SAFE_STR
-    if (    cbEffLimit >= SELM_HYPER_DEFAULT_BASE
-        ||  CPUMGetGuestTR(pVCpu, NULL) != 0)       /* Our shadow TR entry was overwritten when we synced the guest's GDT. */
-#else
-    if (cbEffLimit >= SELM_HYPER_DEFAULT_BASE)
-#endif
+# ifdef VBOX_WITH_SAFE_STR
+    else if (   cbEffLimit >= SELM_HYPER_DEFAULT_BASE
+             || CPUMGetGuestTR(pVCpu, NULL) != 0) /* Our shadow TR entry was overwritten when we synced the guest's GDT. */
+# else
+    else if (cbEffLimit >= SELM_HYPER_DEFAULT_BASE)
+# endif
         /* We overwrote all entries above, so we have to save them again. */
         selmR3SetupHyperGDTSelectors(pVM);
@@ -989 +988 @@
         Log(("SELMR3UpdateFromCPUM: Guest's GDT is changed to pGdt=%016RX64 cbGdt=%08X\n", GDTR.pGdt, GDTR.cbGdt));
 
-#ifdef SELM_TRACK_GUEST_GDT_CHANGES
+# ifdef SELM_TRACK_GUEST_GDT_CHANGES
         /*
          * [Re]Register write virtual handler for guest's GDT.
@@ -1003 +1002 @@
                                          0, selmR3GuestGDTWriteHandler, "selmRCGuestGDTWriteHandler", 0,
                                          "Guest GDT write access handler");
-# ifdef VBOX_WITH_RAW_RING1
+#  ifdef VBOX_WITH_RAW_RING1
         /** @todo !HACK ALERT!
          * Some guest OSes (QNX) share code and the GDT on the same page;
@@ -1021 +1020 @@
                                              "Guest GDT write access handler");
         }
-# endif
+#  endif
         if (RT_FAILURE(rc))
             return rc;
-#endif /* SELM_TRACK_GUEST_GDT_CHANGES */
+# endif /* SELM_TRACK_GUEST_GDT_CHANGES */
 
         /* Update saved Guest GDTR. */
@@ -1136 +1135 @@
                  pVM->selm.s.GCPtrGuestLdt, pVM->selm.s.cbLdtLimit, GCPtrLdt, cbLdt, pVM->selm.s.GuestGdtr.pGdt, pVM->selm.s.GuestGdtr.cbGdt));
 
-#ifdef SELM_TRACK_GUEST_LDT_CHANGES
+# ifdef SELM_TRACK_GUEST_LDT_CHANGES
             /*
              * [Re]Register write virtual handler for guest's GDT.
@@ -1146 +1145 @@
                 AssertRC(rc);
             }
-# ifdef DEBUG
+#  ifdef LOG_ENABLED
             if (pDesc->Gen.u1Present)
                 Log(("LDT selector marked not present!!\n"));
-# endif
+#  endif
             rc = PGMR3HandlerVirtualRegister(pVM, PGMVIRTHANDLERTYPE_WRITE, GCPtrLdt, GCPtrLdt + cbLdt /* already inclusive */,
                                              0, selmR3GuestLDTWriteHandler, "selmRCGuestLDTWriteHandler", 0, "Guest LDT write access handler");
@@ -1166 +1165 @@
                 return rc;
             }
-#else
+# else
             pVM->selm.s.GCPtrGuestLdt = GCPtrLdt;
-#endif
+# endif
             pVM->selm.s.cbLdtLimit = cbLdt;
         }