Update edkII.

CloverHackyColor · Dec 31, 2023 · f184c6d · f184c6d
1 parent 8c86c0e
commit f184c6d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Library/OcCpuLib/FrequencyDetect.c b/Library/OcCpuLib/FrequencyDetect.c
@@ -626,15 +626,15 @@ InternalCalculateVMTFrequency (
   }
 
   if (UnderHypervisor != NULL) {
-    *UnderHypervisor = CpuidVerEcx.Bits.NotUsed != 0;
+    *UnderHypervisor = CpuidVerEcx.Bits.ParaVirtualized != 0;
   }
 
   //
   // TODO: We do not have Hypervisor support in EDK II CPUID structure yet.
   // See https://github.com/acidanthera/audk/pull/2.
   // Get Hypervisor/Virtualization information.
   //
-  if (CpuidVerEcx.Bits.NotUsed == 0) {
+  if (CpuidVerEcx.Bits.ParaVirtualized == 0) {
     return 0;
   }
 

diff --git a/Library/OcMainLib/OcMainLib.inf b/Library/OcMainLib/OcMainLib.inf
@@ -92,15 +92,15 @@
   OcDevicePathLib
   OcDevicePropertyLib
   OcDriverConnectionLib
-  OcFirmwareVolumeLib
+#  OcFirmwareVolumeLib
   OcGuardLib
   OcHashServicesLib
   OcLogAggregatorLib
   OcMachoLib
   OcMiscLib
   OcOSInfoLib
   OcSmbiosLib
-  #OcSmcLib
+# OcSmcLib
   OcStorageLib
   OcUnicodeCollationEngGenericLib
   OcVirtualFsLib

diff --git a/Library/OcPeCoffLib/PeCoffInternal.h b/Library/OcPeCoffLib/PeCoffInternal.h
@@ -22,8 +22,8 @@
 #include <Library/OcPeCoffLib.h>
 #include <Library/OcGuardLib.h>
 
-#define IS_ALIGNED(v, a)  (((v) & ((a) - 1U)) == 0U)
-#define IS_POW2(v)        ((v) != 0 && ((v) & ((v) - 1U)) == 0)
+//#define IS_ALIGNED(v, a)  (((v) & ((a) - 1U)) == 0U)
+//#define IS_POW2(v)        ((v) != 0 && ((v) & ((v) - 1U)) == 0)
 
 #define PTR_TO_ADDR(Ptr, Size)  ((UINTN) Ptr)