kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vm-migration: Make snapshot() mutable

Browse Source 
There will be some cases where the implementation of the snapshot()
function from the Snapshottable trait will require to modify some
internal data, therefore we make this possible by updating the trait
definition with snapshot(&mut self).

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2020-08-21 14:31:58 +02:00
committed by Samuel Ortiz
parent 7b898285d5
commit 871138d5cc
21 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vmm/src/cpu.rs
View File

@@ -400,7 +400,7 @@ impl Snapshottable for Vcpu {
VCPU_SNAPSHOT_ID.to_string()
}
fn snapshot(&self) -> std::result::Result<Snapshot, MigratableError> {
fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
let snapshot = serde_json::to_vec(&self.saved_state)
.map_err(|e| MigratableError::Snapshot(e.into()))?;
@@ -1368,7 +1368,7 @@ impl Snapshottable for CpuManager {
CPU_MANAGER_SNAPSHOT_ID.to_string()
}
fn snapshot(&self) -> std::result::Result<Snapshot, MigratableError> {
fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
let mut cpu_manager_snapshot = Snapshot::new(CPU_MANAGER_SNAPSHOT_ID);
// The CpuManager snapshot is a collection of all vCPUs snapshots.

2
vmm/src/device_manager.rs
View File

@@ -3626,7 +3626,7 @@ impl Snapshottable for DeviceManager {
DEVICE_MANAGER_SNAPSHOT_ID.to_string()
}
fn snapshot(&self) -> std::result::Result<Snapshot, MigratableError> {
fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
let mut snapshot = Snapshot::new(DEVICE_MANAGER_SNAPSHOT_ID);
// We aggregate all devices snapshots.

2
vmm/src/memory_manager.rs
View File

@@ -1526,7 +1526,7 @@ impl Snapshottable for MemoryManager {
MEMORY_MANAGER_SNAPSHOT_ID.to_string()
}
fn snapshot(&self) -> result::Result<Snapshot, MigratableError> {
fn snapshot(&mut self) -> result::Result<Snapshot, MigratableError> {
if self.use_zones {
return Err(MigratableError::Snapshot(anyhow!(
"Not allowed to snapshot guest memory when backed with user \

2
vmm/src/vm.rs
View File

@@ -1267,7 +1267,7 @@ impl Snapshottable for Vm {
VM_SNAPSHOT_ID.to_string()
}
fn snapshot(&self) -> std::result::Result<Snapshot, MigratableError> {
fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
let current_state = self.get_state().unwrap();
if current_state != VmState::Paused {
return Err(MigratableError::Snapshot(anyhow!(