External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-04 19:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: Use legacy definitions of kvm structs for live-upgrade

Browse Source 
Use 'kvm_vcpu_events_old' and 'kvm_clock_data_old' to support
deserialization from legacy definitions of kvm structs, so that we can
support live-upgrade from previous point releases.

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2024-03-11 12:02:57 -07:00 committed by Bo Chen
parent de6d6f2558
commit 3c4ff7de01
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1152,7 +1152,7 @@ dependencies = [
[[package]] [[package]]
name = "kvm-bindings" name = "kvm-bindings"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0#2dcf85d4f8aa55befcaa996b699ddb18ec9ed059" source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-live-upgrade-stable-37.x#f03fc575cdf20c3af9ca3d4d203f171943d95be4"
dependencies = [ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",

2
Cargo.toml
View File

@ -52,7 +52,7 @@ zbus = { version = "3.11.1", optional = true }
# List of patched crates # List of patched crates
[patch.crates-io] [patch.crates-io]
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0" } kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-live-upgrade-stable-37.x" }
versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" } versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" }
[dev-dependencies] [dev-dependencies]

2
fuzz/Cargo.lock generated
View File

@ -477,7 +477,7 @@ dependencies = [
[[package]] [[package]]
name = "kvm-bindings" name = "kvm-bindings"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0#2dcf85d4f8aa55befcaa996b699ddb18ec9ed059" source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-live-upgrade-stable-37.x#f03fc575cdf20c3af9ca3d4d203f171943d95be4"
dependencies = [ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",

2
fuzz/Cargo.toml
View File

@ -35,7 +35,7 @@ vm-virtio = { path = "../vm-virtio" }
path = ".." path = ".."
[patch.crates-io] [patch.crates-io]
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0" } kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-live-upgrade-stable-37.x" }
versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" } versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" }
# Prevent this from interfering with workspaces # Prevent this from interfering with workspaces

2
hypervisor/Cargo.toml
View File

@ -19,7 +19,7 @@ igvm_parser = { git = "https://github.com/microsoft/igvm", branch = "main", pack
libc = "0.2.147" libc = "0.2.147"
log = "0.4.20" log = "0.4.20"
kvm-ioctls = { version = "0.16.0", optional = true } kvm-ioctls = { version = "0.16.0", optional = true }
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0", features = ["with-serde", "fam-wrappers"], optional = true } kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-live-upgrade-stable-37.x", features = ["with-serde", "fam-wrappers"], optional = true }
mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional = true } mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional = true }
mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional = true} mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional = true}
serde = { version = "1.0.168", features = ["rc", "derive"] } serde = { version = "1.0.168", features = ["rc", "derive"] }

8
hypervisor/src/kvm/mod.rs
View File

@ -315,7 +315,7 @@ impl From<CpuState> for VcpuKvmState {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
impl From<kvm_clock_data> for ClockData { impl From<kvm_clock_data> for ClockData {
fn from(d: kvm_clock_data) -> Self { fn from(d: kvm_clock_data) -> Self {
ClockData::Kvm(d) ClockData::Kvm(d.into())
} }
} }
@ -323,7 +323,7 @@ impl From<kvm_clock_data> for ClockData {
impl From<ClockData> for kvm_clock_data { impl From<ClockData> for kvm_clock_data {
fn from(ms: ClockData) -> Self { fn from(ms: ClockData) -> Self {
match ms { match ms {
ClockData::Kvm(s) => s, ClockData::Kvm(s) => s.into(),
/* Needed in case other hypervisors are enabled */ /* Needed in case other hypervisors are enabled */
#[allow(unreachable_patterns)] #[allow(unreachable_patterns)]
_ => panic!("CpuState is not valid"), _ => panic!("CpuState is not valid"),
@ -1977,7 +1977,7 @@ impl cpu::Vcpu for KvmVcpu {
msr_entries msr_entries
}; };
let vcpu_events = self.get_vcpu_events()?; let vcpu_events = self.get_vcpu_events()?.into();
let tsc_khz = self.tsc_khz()?; let tsc_khz = self.tsc_khz()?;
Ok(VcpuKvmState { Ok(VcpuKvmState {
@ -2130,7 +2130,7 @@ impl cpu::Vcpu for KvmVcpu {
} }
} }
self.set_vcpu_events(&state.vcpu_events)?; self.set_vcpu_events(&state.vcpu_events.into())?;
Ok(()) Ok(())
} }

2
hypervisor/src/kvm/x86_64/mod.rs
View File

@ -22,7 +22,7 @@ pub use {
kvm_bindings::kvm_cpuid_entry2, kvm_bindings::kvm_dtable, kvm_bindings::kvm_fpu, kvm_bindings::kvm_cpuid_entry2, kvm_bindings::kvm_dtable, kvm_bindings::kvm_fpu,
kvm_bindings::kvm_lapic_state, kvm_bindings::kvm_mp_state as MpState, kvm_bindings::kvm_lapic_state, kvm_bindings::kvm_mp_state as MpState,
kvm_bindings::kvm_msr_entry, kvm_bindings::kvm_regs, kvm_bindings::kvm_segment, kvm_bindings::kvm_msr_entry, kvm_bindings::kvm_regs, kvm_bindings::kvm_segment,
kvm_bindings::kvm_sregs, kvm_bindings::kvm_vcpu_events as VcpuEvents, kvm_bindings::kvm_sregs, kvm_bindings::kvm_vcpu_events_old as VcpuEvents,
kvm_bindings::kvm_xcrs as ExtendedControlRegisters, kvm_bindings::kvm_xsave, kvm_bindings::kvm_xcrs as ExtendedControlRegisters, kvm_bindings::kvm_xsave,
kvm_bindings::CpuId, kvm_bindings::MsrList, kvm_bindings::Msrs as MsrEntries, kvm_bindings::CpuId, kvm_bindings::MsrList, kvm_bindings::Msrs as MsrEntries,
kvm_bindings::KVM_CPUID_FLAG_SIGNIFCANT_INDEX, kvm_bindings::KVM_CPUID_FLAG_SIGNIFCANT_INDEX,

2
hypervisor/src/lib.rs
View File

@ -162,7 +162,7 @@ pub enum CpuState {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
pub enum ClockData { pub enum ClockData {
#[cfg(feature = "kvm")] #[cfg(feature = "kvm")]
Kvm(kvm_bindings::kvm_clock_data), Kvm(kvm_bindings::kvm_clock_data_old),
#[cfg(feature = "mshv")] #[cfg(feature = "mshv")]
Mshv, /* MSHV does not support ClockData yet */ Mshv, /* MSHV does not support ClockData yet */
} }