Changeset 8115 in vbox

Timestamp:

Apr 17, 2008 4:57:00 PM (17 years ago)

Author:

vboxsync

Message:

Don't assert if RTMpOnAll returns VERR_NOT_SUPPORTED!

File:

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

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

@@ -315 +315 @@
 /**
  * Checks the error code array filled in for each cpu in the system.
- * 
+ *
  * @returns VBox status code.
  * @param   paRc        Error code array
@@ -353 +353 @@
     memset(aRc, 0, sizeof(aRc));
     int rc = RTMpOnAll(HWACCMR0DisableCPU, aRc, NULL);
-    AssertRC(rc);
+    Assert(RT_SUCCESS(rc) || rc == VERR_NOT_SUPPORTED);
 
     /* Free the per-cpu pages used for VT-x and AMD-V */
@@ -372 +372 @@
  * Worker function passed to RTMpOnAll, RTMpOnOthers and RTMpOnSpecific that
  * is to be called on the target cpus.
- * 
+ *
  * @param   idCpu       The identifier for the CPU the function is called on.
  * @param   pvUser1     The 1st user argument.
@@ -386 +386 @@
     SUPR0Printf("HWACCMR0InitCPU cpu %d\n", idCpu);
 #endif
+    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /// @todo fix idCpu == index assumption (rainy day)
 
     if (u32VendorEBX == X86_CPUID_VENDOR_INTEL_EBX)
@@ -500 +501 @@
  * Worker function passed to RTMpOnAll, RTMpOnOthers and RTMpOnSpecific that
  * is to be called on the target cpus.
- * 
+ *
  * @param   idCpu       The identifier for the CPU the function is called on.
  * @param   pvUser1     The 1st user argument.
@@ -513 +514 @@
 
     Assert(pVM);
+    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /// @todo fix idCpu == index assumption (rainy day)
     Assert(idCpu < RT_ELEMENTS(HWACCMR0Globals.aCpuInfo));
 
@@ -546 +548 @@
  * Worker function passed to RTMpOnAll, RTMpOnOthers and RTMpOnSpecific that
  * is to be called on the target cpus.
- * 
+ *
  * @param   idCpu       The identifier for the CPU the function is called on.
  * @param   pvUser1     The 1st user argument.
@@ -557 +559 @@
     int     *paRc = (int *)pvUser1;
 
+    Assert(idCpu == (RTCPUID)RTMpCpuIdToSetIndex(idCpu)); /// @todo fix idCpu == index assumption (rainy day)
     Assert(idCpu < RT_ELEMENTS(HWACCMR0Globals.aCpuInfo));