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

vmm: Simplify memory state to support Versionize

Browse Source 
In order to support using Versionize for state structures it is necessary
to use simpler, primitive, data types in the state definitions used for
snapshot restore.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2021-04-23 10:55:05 +01:00
parent dab1cab4a7
commit 01f0c1e313
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/memory_manager.rs
+8 -9
View File
@@ -488,7 +488,7 @@ impl MemoryManager {
self.guest_memory self.guest_memory
.memory() .memory()
.read_exact_from( .read_exact_from(
region.start_addr, GuestAddress(region.start_addr),
&mut memory_region_file, &mut memory_region_file,
region.size as usize, region.size as usize,
) )
@@ -870,7 +870,7 @@ impl MemoryManager {
if let Some(content) = &mut region.content { if let Some(content) = &mut region.content {
let mut memory_region_path = vm_snapshot_path.clone(); let mut memory_region_path = vm_snapshot_path.clone();
memory_region_path.push(content.clone()); memory_region_path.push(content.clone());
*content = memory_region_path; *content = memory_region_path.to_str().unwrap().to_owned();
} }
} }
@@ -1928,10 +1928,9 @@ pub struct GuestAddressDef(pub u64);
#[derive(Clone, Serialize, Deserialize)] #[derive(Clone, Serialize, Deserialize)]
pub struct MemoryRegion { pub struct MemoryRegion {
content: Option<PathBuf>, content: Option<String>,
#[serde(with = "GuestAddressDef")] start_addr: u64,
start_addr: GuestAddress, size: u64,
size: GuestUsize,
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
@@ -1974,8 +1973,8 @@ impl Snapshottable for MemoryManager {
} }
memory_regions.push(MemoryRegion { memory_regions.push(MemoryRegion {
content, content: content.map(|p| p.to_str().unwrap().to_owned()),
start_addr: region.start_addr(), start_addr: region.start_addr().0,
size: region.len(), size: region.len(),
}); });
@@ -2028,7 +2027,7 @@ impl Transportable for MemoryManager {
guest_memory guest_memory
.write_all_to( .write_all_to(
region.start_addr, GuestAddress(region.start_addr),
&mut memory_region_file, &mut memory_region_file,
region.size as usize, region.size as usize,
) )