Skip to content

Commit 6513dfd

Browse files
committed
chore(vmm): Remove unnecessary constants
The MSR indices are generated by bind-gen. Signed-off-by: Takahiro Itazuri <[email protected]>
1 parent c2f7918 commit 6513dfd

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/vmm/src/arch/x86_64/msr.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use crate::arch::x86_64::generated::hyperv_tlfs::*;
1111
use crate::arch::x86_64::generated::msr_index::*;
1212
use crate::arch::x86_64::generated::perf_event::*;
1313
use crate::cpu_config::x86_64::cpuid::common::GetCpuidError;
14+
use crate::logger::info;
1415

1516
#[derive(Debug, PartialEq, Eq, thiserror::Error, displaydoc::Display)]
1617
/// MSR related errors.
@@ -58,14 +59,6 @@ const MSR_KVM_PV_EOI_EN: u32 = 0x4b56_4d04;
5859
const MSR_KVM_POLL_CONTROL: u32 = 0x4b56_4d05;
5960
const MSR_KVM_ASYNC_PF_INT: u32 = 0x4b56_4d06;
6061

61-
/// Taken from arch/x86/include/asm/msr-index.h
62-
/// Spectre mitigations control MSR
63-
pub const MSR_IA32_SPEC_CTRL: u32 = 0x0000_0048;
64-
/// Architecture capabilities MSR
65-
pub const MSR_IA32_ARCH_CAPABILITIES: u32 = 0x0000_010a;
66-
67-
const MSR_IA32_PRED_CMD: u32 = 0x0000_0049;
68-
6962
bitflags! {
7063
/// Feature flags enumerated in the IA32_ARCH_CAPABILITIES MSR.
7164
/// See https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/technical-documentation/cpuid-enumeration-and-architectural-msrs.html
@@ -269,6 +262,9 @@ pub fn get_msrs_to_save(kvm_fd: &Kvm) -> Result<MsrList, MsrError> {
269262
let mut msr_index_list = kvm_fd
270263
.get_msr_index_list()
271264
.map_err(MsrError::GetMsrIndexList)?;
265+
for idx in msr_index_list.as_slice() {
266+
info!("{idx:#x}");
267+
}
272268
msr_index_list.retain(|msr_index| msr_should_serialize(*msr_index));
273269
Ok(msr_index_list)
274270
}

0 commit comments

Comments
 (0)