Merge pull request #5 from gierens/fix-vmx-check-vmx_root

Fix VMX Check (whiz-vmm-vmx_root)
smallkirby · Jan 15, 2025 · 4fdca72 · 4fdca72
1 parent ab3f372
commit 4fdca72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ymir/arch/x86/arch.zig b/ymir/arch/x86/arch.zig
@@ -39,7 +39,7 @@ pub fn getCpuVendorId() [12]u8 {
 /// Check if virtualization technology is supported.
 pub fn isVmxSupported() bool {
     // Check CPUID if VMX is supported.
-    const regs = cpuid.Leaf.query(.ext_feature, null);
+    const regs = cpuid.Leaf.query(.vers_and_feat_info, null);
     const ecx: cpuid.FeatureInfoEcx = @bitCast(regs.ecx);
     if (!ecx.vmx) return false;
 

diff --git a/ymir/arch/x86/cpuid.zig b/ymir/arch/x86/cpuid.zig
@@ -3,8 +3,8 @@
 pub const Leaf = enum(u32) {
     /// Maximum input value for basic CPUID.
     maximum_input = 0x0,
-    /// Version information.
-    version_info = 0x1,
+    /// Version and feature information.
+    vers_and_feat_info = 0x1,
     /// Thermal and power management.
     thermal_power = 0x6,
     /// Structured extended feature enumeration.