Changeset 37231 in vbox for trunk

Timestamp:

May 27, 2011 11:28:52 AM (14 years ago)

Author:

vboxsync

Message:

HWACCMR0: Fixed bug in HWACCMR0EnableAllCpus, the current CPU is always possible. :-) Some nits and cleanup.

File:

• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (7 diffs)

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

@@ -51 +51 @@
 static bool               hwaccmR0IsSubjectToVmxPreemptionTimerErratum(void);
 static DECLCALLBACK(void) hwaccmR0PowerCallback(RTPOWEREVENT enmEvent, void *pvUser);
-static DECLCALLBACK(void) hwaccmR0CpuCallback(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvData);
+static DECLCALLBACK(void) hwaccmR0MpEventCallback(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvData);
 
 /*******************************************************************************
@@ -499 +499 @@
     if (!HWACCMR0Globals.vmx.fUsingSUPR0EnableVTx)
     {
-        rc = RTMpNotificationRegister(hwaccmR0CpuCallback, 0);
+        rc = RTMpNotificationRegister(hwaccmR0MpEventCallback, NULL);
         AssertRC(rc);
 
-        rc = RTPowerNotificationRegister(hwaccmR0PowerCallback, 0);
+        rc = RTPowerNotificationRegister(hwaccmR0PowerCallback, NULL);
         AssertRC(rc);
     }
@@ -580 +580 @@
         {
             /* Doesn't really matter if this fails. */
-            rc = RTMpNotificationDeregister(hwaccmR0CpuCallback, 0);
-            AssertRC(rc);
-            rc = RTPowerNotificationDeregister(hwaccmR0PowerCallback, 0);
-            AssertRC(rc);
+            rc = RTMpNotificationDeregister(hwaccmR0MpEventCallback, NULL);  AssertRC(rc);
+            rc = RTPowerNotificationDeregister(hwaccmR0PowerCallback, NULL); AssertRC(rc);
         }
         else
@@ -603 +601 @@
 
         /* Free the per-cpu pages used for VT-x and AMD-V */
-        for (unsigned i=0;i<RT_ELEMENTS(HWACCMR0Globals.aCpuInfo);i++)
+        for (unsigned i = 0; i < RT_ELEMENTS(HWACCMR0Globals.aCpuInfo); i++)
         {
             if (HWACCMR0Globals.aCpuInfo[i].pMemObj != NIL_RTR0MEMOBJ)
@@ -735 +733 @@
         {
             /* Allocate one page per cpu for the global vt-x and amd-v pages */
-            for (unsigned i=0;i<RT_ELEMENTS(HWACCMR0Globals.aCpuInfo);i++)
+            for (unsigned i = 0; i < RT_ELEMENTS(HWACCMR0Globals.aCpuInfo); i++)
             {
                 Assert(!HWACCMR0Globals.aCpuInfo[i].pMemObj);
 
-                if (RTMpIsCpuPossible(RTMpCpuId()))
+                if (RTMpIsCpuPossible(RTMpCpuIdFromSetIndex(i)))
                 {
                     rc = RTR0MemObjAllocCont(&HWACCMR0Globals.aCpuInfo[i].pMemObj, 1 << PAGE_SHIFT, true /* executable R0 mapping */);
@@ -805 +803 @@
     if (!pCpu->pMemObj)
     {
-        LogRel(("HWACCMR0: hwaccmR0EnableCpu failed idCpu=%d.\n", idCpu));
-        AssertFailed();
+        AssertLogRelMsgFailed(("hwaccmR0EnableCpu failed idCpu=%u.\n", idCpu));
         return VERR_INTERNAL_ERROR;
     }
@@ -900 +897 @@
  * @param   pvData              Opaque data (PVM pointer).
  */
-static DECLCALLBACK(void) hwaccmR0CpuCallback(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvData)
+static DECLCALLBACK(void) hwaccmR0MpEventCallback(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvData)
 {
     /*