Changeset 44078 in vbox

Timestamp:

Dec 10, 2012 1:19:18 PM (12 years ago)

Author:

vboxsync

Message:

VMMR0/CPUMR0: atomic update of aGuestCpuId*(); fix return type of CPUMR3LogCpuIds()

Location:

trunk

Files:

trunk/include/VBox/vmm/cpum.h

r44076	r44078
415	415	VMMR3DECL(int) CPUMR3Init(PVM pVM);
416	416	VMMR3DECL(int) CPUMR3InitCompleted(PVM pVM);
417		VMMR3DECL(~~int)~~ CPUMR3LogCpuIds(PVM pVM);
	417	VMMR3DECL(void) CPUMR3LogCpuIds(PVM pVM);
418	418	VMMR3DECL(void) CPUMR3Relocate(PVM pVM);
419	419	VMMR3DECL(int) CPUMR3Term(PVM pVM);

-              r44077
+              r44078
  * @{bugref 5436}.
+ *
+ * @note This function might be called simultaneously on more than one CPU!
+ *
  * @param   idCpu       The identifier for the CPU the function is called on.
  * @param   pvUser1     Pointer to the VM structure.
 …
             paLeaves = &pCPUM->aGuestCpuIdCentaur[uLeave - 0xc0000000];
         /* unify important bits */
         paLeaves->ecx &= (ecx | ~aCpuidUnify[i].ecx);
         paLeaves->edx &= (edx | ~aCpuidUnify[i].edx);
+        ASMAtomicAndU32(&paLeaves->ecx, ecx | ~aCpuidUnify[i].ecx);
+        ASMAtomicAndU32(&paLeaves->edx, edx | ~aCpuidUnify[i].edx);
+    }
+}

-              r44076
+              r44078
  * Called when the ring-0 init phases comleted.
+ *
- * @returns VBox status code.
  * @param   pVM                 Pointer to the VM.
  */
 VMMR3DECL(int) CPUMR3LogCpuIds(PVM pVM)
+VMMR3DECL(void) CPUMR3LogCpuIds(PVM pVM)
+{
     /*
 …
     RTLogRelSetBuffering(fOldBuffered);
     LogRel(("******************** End of CPUID dump **********************\n"));
-    return VINF_SUCCESS;
+}

-              r44076
+              r44078
              * CPUM's post-initialization (print CPUIDs).
              */
+            rc = CPUMR3LogCpuIds(pVM);
+            AssertRCReturn(rc, rc);
+            CPUMR3LogCpuIds(pVM);
             break;
+        }

Note: See TracChangeset for help on using the changeset viewer.