From 4af98f4cb21df33e0551cddd4130a2fd92ac1db9 Mon Sep 17 00:00:00 2001 From: Muminul Islam Date: Thu, 24 Apr 2025 09:07:27 -0700 Subject: [PATCH] hypervisor: mshv: get_msr_list return vector instead fam-wrapper New MSHV version updates the get_msr_list output as vector instead of fam-wrapper. It avoids unnecessary conversions. Signed-off-by: Muminul Islam --- hypervisor/src/mshv/mod.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hypervisor/src/mshv/mod.rs b/hypervisor/src/mshv/mod.rs index becb4a9bb..686282e8d 100644 --- a/hypervisor/src/mshv/mod.rs +++ b/hypervisor/src/mshv/mod.rs @@ -262,7 +262,7 @@ impl MshvHypervisor { /// /// Retrieve the list of MSRs supported by MSHV. /// - fn get_msr_list(&self) -> hypervisor::Result { + fn get_msr_list(&self) -> hypervisor::Result> { self.mshv .get_msr_index_list() .map_err(|e| hypervisor::HypervisorError::GetMsrList(e.into())) @@ -347,15 +347,13 @@ impl MshvHypervisor { #[cfg(target_arch = "x86_64")] { let msr_list = self.get_msr_list()?; - let num_msrs = msr_list.as_fam_struct_ref().nmsrs as usize; let mut msrs: Vec = vec![ MsrEntry { ..Default::default() }; - num_msrs + msr_list.len() ]; - let indices = msr_list.as_slice(); - for (pos, index) in indices.iter().enumerate() { + for (pos, index) in msr_list.iter().enumerate() { msrs[pos].index = *index; }