Changeset 10504 in vbox for trunk/src/VBox

Timestamp:

Jul 11, 2008 9:41:54 AM (16 years ago)

Author:

vboxsync

Message:

Don't violate my own rules...

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (3 diffs)

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

@@ -872 +872 @@
     pVMCB->ctrl.NestedPaging.n.u1NestedPaging = pVM->hwaccm.s.fNestedPaging;
 
+#ifdef LOG_ENABLED
+    PHWACCM_CPUINFO pCpuTemp = HWACCMR0GetCurrentCpu();
+    if (    pVM->hwaccm.s.svm.idLastCpu != pCpuTemp->idCpu
+        ||  pVM->hwaccm.s.svm.cTLBFlushes != pCpuTemp->cTLBFlushes)
+    {
+        if (pVM->hwaccm.s.svm.idLastCpu != pCpuTemp->idCpu)
+            Log(("Force TLB flush due to rescheduling to a different cpu (%d vs %d)\n", pVM->hwaccm.s.svm.idLastCpu, pCpuTemp->idCpu));
+        else
+            Log(("Force TLB flush due to changed TLB flush count (%x vs %x)\n", pVM->hwaccm.s.svm.cTLBFlushes, pCpuTemp->cTLBFlushes));
+    }
+    if (pCpuTemp->fFlushTLB) 
+        Log(("SVMR0RunGuestCode: First time cpu %d is used -> flush\n", pCpuTemp->idCpu));
+#endif
+
     /*
      * NOTE: DO NOT DO ANYTHING AFTER THIS POINT THAT MIGHT JUMP BACK TO RING 3!
@@ -883 +897 @@
         ||  pVM->hwaccm.s.svm.cTLBFlushes != pCpu->cTLBFlushes)
     {
-#ifdef LOG_ENABLED
-        if (pVM->hwaccm.s.svm.idLastCpu != pCpu->idCpu)
-            Log(("Force TLB flush due to rescheduling to a different cpu (%d vs %d)\n", pVM->hwaccm.s.svm.idLastCpu, pCpu->idCpu));
-        else
-            Log(("Force TLB flush due to changed TLB flush count (%x vs %x)\n", pVM->hwaccm.s.svm.cTLBFlushes, pCpu->cTLBFlushes));
-#endif
         /* Force a TLB flush on VM entry. */
         pVM->hwaccm.s.svm.fForceTLBFlush = true;
@@ -901 +909 @@
             ||  pCpu->fFlushTLB)
         {
-#ifdef LOG_ENABLED
-            if (pCpu->fFlushTLB) 
-                Log(("SVMR0RunGuestCode: First time cpu %d is used -> flush\n", pCpu->idCpu));
-#endif
-
             pCpu->fFlushTLB                  = false;
             pCpu->uCurrentASID               = 1;       /* start at 1; host uses 0 */