Changeset 75661 in vbox

Timestamp:

Nov 22, 2018 12:33:18 PM (6 years ago)

Author:

vboxsync

Message:

VMM/GVMMR0SchedHalt: doxygen fix.

Location:

trunk

Files:

• include/VBox/vmm/gvmm.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (7 diffs)

trunk/include/VBox/vmm/gvmm.h

@@ -172 +172 @@
 GVMMR0DECL(PVM)     GVMMR0GetVMByEMT(RTNATIVETHREAD hEMT);
 GVMMR0DECL(PGVMCPU) GVMMR0GetGVCpuByEMT(RTNATIVETHREAD hEMT);
-GVMMR0DECL(int)     GVMMR0SchedHalt(PGVM pGVM, PVM pVM, PGVMCPU pCurGVCpu, uint64_t u64ExpireGipTime);
+GVMMR0DECL(int)     GVMMR0SchedHalt(PGVM pGVM, PVM pVM, PGVMCPU pGVCpu, uint64_t u64ExpireGipTime);
 GVMMR0DECL(int)     GVMMR0SchedHaltReq(PGVM pGVM, PVM pVM, VMCPUID idCpu, uint64_t u64ExpireGipTime);
 GVMMR0DECL(int)     GVMMR0SchedWakeUp(PGVM pGVM, PVM pVM, VMCPUID idCpu);

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

@@ -2157 +2157 @@
  * @param   pGVM                The global (ring-0) VM structure.
  * @param   pVM                 The cross context VM structure.
- * @param   idCpu               The Virtual CPU ID of the calling EMT.
+ * @param   pGVCpu              The global (ring-0) CPU structure of the calling
+ *                              EMT.
  * @param   u64ExpireGipTime    The time for the sleep to expire expressed as GIP time.
- * @thread  EMT(idCpu).
- */
-GVMMR0DECL(int) GVMMR0SchedHalt(PGVM pGVM, PVM pVM, PGVMCPU pCurGVCpu, uint64_t u64ExpireGipTime)
-{
-    LogFlow(("GVMMR0SchedHalt: pGVM=%p pVM=%p pCurGVCpu=%p(%d) u64ExpireGipTime=%#RX64\n",
-             pGVM, pVM, pCurGVCpu, pCurGVCpu->idCpu, u64ExpireGipTime));
+ * @thread  EMT(pGVCpu).
+ */
+GVMMR0DECL(int) GVMMR0SchedHalt(PGVM pGVM, PVM pVM, PGVMCPU pGVCpu, uint64_t u64ExpireGipTime)
+{
+    LogFlow(("GVMMR0SchedHalt: pGVM=%p pVM=%p pGVCpu=%p(%d) u64ExpireGipTime=%#RX64\n",
+             pGVM, pVM, pGVCpu, pGVCpu->idCpu, u64ExpireGipTime));
     GVMM_CHECK_SMAP_SETUP();
     GVMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING);
@@ -2172 +2173 @@
 
     pGVM->gvmm.s.StatsSched.cHaltCalls++;
-    Assert(!pCurGVCpu->gvmm.s.u64HaltExpire);
+    Assert(!pGVCpu->gvmm.s.u64HaltExpire);
 
     /*
@@ -2186 +2187 @@
     }
 
-    pCurGVCpu->gvmm.s.iCpuEmt = ASMGetApicId();
+    pGVCpu->gvmm.s.iCpuEmt = ASMGetApicId();
 
     /* GIP hack: We might are frequently sleeping for short intervals where the
@@ -2216 +2217 @@
         if (cNsInterval > RT_NS_1SEC)
             u64ExpireGipTime = u64NowGip + RT_NS_1SEC;
-        ASMAtomicWriteU64(&pCurGVCpu->gvmm.s.u64HaltExpire, u64ExpireGipTime);
+        ASMAtomicWriteU64(&pGVCpu->gvmm.s.u64HaltExpire, u64ExpireGipTime);
         ASMAtomicIncU32(&pGVMM->cHaltedEMTs);
         if (fDoEarlyWakeUps)
@@ -2226 +2227 @@
         GVMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING);
 
-        rc = RTSemEventMultiWaitEx(pCurGVCpu->gvmm.s.HaltEventMulti,
+        rc = RTSemEventMultiWaitEx(pGVCpu->gvmm.s.HaltEventMulti,
                                    RTSEMWAIT_FLAGS_ABSOLUTE | RTSEMWAIT_FLAGS_NANOSECS | RTSEMWAIT_FLAGS_INTERRUPTIBLE,
                                    u64NowGip > u64NowSys ? u64ExpireGipTime : u64NowSys + cNsInterval);
         GVMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING);
 
-        ASMAtomicWriteU64(&pCurGVCpu->gvmm.s.u64HaltExpire, 0);
+        ASMAtomicWriteU64(&pGVCpu->gvmm.s.u64HaltExpire, 0);
         ASMAtomicDecU32(&pGVMM->cHaltedEMTs);
 
@@ -2237 +2238 @@
         if (rc == VINF_SUCCESS)
         {
-            RTSemEventMultiReset(pCurGVCpu->gvmm.s.HaltEventMulti);
+            RTSemEventMultiReset(pGVCpu->gvmm.s.HaltEventMulti);
             GVMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING);
         }
@@ -2252 +2253 @@
             GVMMR0_USED_SHARED_UNLOCK(pGVMM);
         GVMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING);
-        RTSemEventMultiReset(pCurGVCpu->gvmm.s.HaltEventMulti);
+        RTSemEventMultiReset(pGVCpu->gvmm.s.HaltEventMulti);
         GVMM_CHECK_SMAP_CHECK2(pVM, RT_NOTHING);
         rc = VINF_SUCCESS;