OcCpuLib: Fix crash when gathering system report on virtualised CPUs

closes acidanthera/bugtracker#2270
buliangjunpp · May 7, 2023 · d25ec52 · d25ec52
1 parent 47a3da4
commit d25ec52
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -17,6 +17,7 @@ OpenCore Changelog
 - Updated build process to provide stable and bleeding-edge versions of `EnableGop`
 - Implemented minor improvements in `PickerMode` `Apple`
 - Improved filtering algorithm for `LogModules` option
+- Fixed crash when gathering system report on virtualised CPUs
 
 #### v0.9.1
 - Fixed long comment printing for ACPI patches, thx @corpnewt

diff --git a/Library/OcCpuLib/OcCpuLib.c b/Library/OcCpuLib/OcCpuLib.c
@@ -999,6 +999,14 @@ OcCpuGetMsrReport (
     return;
   }
 
+  //
+  // Hypervisors virtualise MSRs so the values are either not present
+  // and cause a crash or are irrelevant as they report placeholders.
+  //
+  if (CpuInfo->Hypervisor) {
+    return;
+  }
+
   if (CpuInfo->CpuGeneration >= OcCpuGenerationNehalem) {
     //
     // MSR_PLATFORM_INFO