fixup! mshv-{bindings, ioctls}: Add more synthetic MSRs

Signed-off-by: Nuno Das Neves <nudasnev@microsoft.com>

Author: NunoDasNeves

mshv-bindings/src/regs.rs

@@ -342,8 +342,8 @@ pub fn msr_to_hv_reg_name(msr: u32) -> Result<::std::os::raw::c_uint, &'static s
         HV_X64_MSR_SINT15 => Ok(hv_register_name_HV_REGISTER_SINT15),
         IA32_MSR_MISC_ENABLE => Ok(hv_register_name_HV_X64_REGISTER_MSR_IA32_MISC_ENABLE),
         HV_X64_MSR_SCONTROL => Ok(hv_register_name_HV_REGISTER_SCONTROL),
-        HV_X64_MSR_SIEFP => Ok(hv_register_name_HV_REGISTER_SIFP),
-        HV_X64_MSR_SIMP => Ok(hv_register_name_HV_REGISTER_SIPP),
+        HV_X64_MSR_SIEFP => Ok(hv_register_name_HV_REGISTER_SIEFP),
+        HV_X64_MSR_SIMP => Ok(hv_register_name_HV_REGISTER_SIMP),
         HV_X64_MSR_REFERENCE_TSC => Ok(hv_register_name_HV_REGISTER_REFERENCE_TSC),
         HV_X64_MSR_EOM => Ok(hv_register_name_HV_REGISTER_EOM),
         _ => Err("Not a supported hv_register_name msr"),

mshv-ioctls/src/ioctls/system.rs

@@ -366,7 +366,7 @@ impl Mshv {
                 MPX support needed for this MSR
                 Currently feature is not enabled
             */
-            IA32_MSR_SPEC_CTRL,
+            //IA32_MSR_SPEC_CTRL,
             //IA32_MSR_TSC_ADJUST, // Current hypervisor version does not allow to get this MSR, need to check later
             HV_X64_MSR_GUEST_OS_ID,
             HV_X64_MSR_SINT0,
@@ -419,7 +419,7 @@ mod tests {
     fn test_get_msr_index_list() {
         let hv = Mshv::new().unwrap();
         let msr_list = hv.get_msr_index_list().unwrap();
-        assert!(msr_list.as_fam_struct_ref().nmsrs == 65);
+        assert!(msr_list.as_fam_struct_ref().nmsrs == 64);
 
         let mut found = false;
         for index in msr_list.as_slice() {