From 4ff0686d379ab4b666b901babe704143b4cf6f07 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 11 May 2022 17:07:16 +0100 Subject: [PATCH] hypervisor: mshv: Move CpuIdEntry alias into x86_64 module This is consistent with kvm and correctly reflects the architectural dependency. Signed-off-by: Rob Bradford --- hypervisor/src/mshv/mod.rs | 3 --- hypervisor/src/mshv/x86_64/mod.rs | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hypervisor/src/mshv/mod.rs b/hypervisor/src/mshv/mod.rs index fa0ef3160..1b925cc0f 100644 --- a/hypervisor/src/mshv/mod.rs +++ b/hypervisor/src/mshv/mod.rs @@ -1048,6 +1048,3 @@ impl vm::Vm for MshvVm { .map_err(|e| vm::HypervisorVmError::GetDirtyLog(e.into())) } } -pub use hv_cpuid_entry as CpuIdEntry; - -pub const CPUID_FLAG_VALID_INDEX: u32 = 0; diff --git a/hypervisor/src/mshv/x86_64/mod.rs b/hypervisor/src/mshv/x86_64/mod.rs index 0b9e8eded..4d63e3df5 100644 --- a/hypervisor/src/mshv/x86_64/mod.rs +++ b/hypervisor/src/mshv/x86_64/mod.rs @@ -15,6 +15,7 @@ use std::fmt; /// Export generically-named wrappers of mshv_bindings for Unix-based platforms /// pub use { + mshv_bindings::hv_cpuid_entry as CpuIdEntry, mshv_bindings::mshv_user_mem_region as MemoryRegion, mshv_bindings::msr_entry as MsrEntry, mshv_bindings::CpuId, mshv_bindings::DebugRegisters, mshv_bindings::FloatingPointUnit as FpuState, mshv_bindings::LapicState, @@ -25,6 +26,8 @@ pub use { mshv_bindings::Xcrs as ExtendedControlRegisters, }; +pub const CPUID_FLAG_VALID_INDEX: u32 = 0; + #[derive(Clone, Serialize, Deserialize)] pub struct VcpuMshvState { pub msrs: MsrEntries,