External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-02 11:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: memory_manager: Remove restrictions about snapshot/restore

Browse Source 
User defined memory regions can now support being snapshot and restored,
therefore this commit removes the restrictions that were applied through
earlier commit.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-08-24 10:46:18 +02:00 committed by Samuel Ortiz
parent 2583d572fc
commit 5bf7113768
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vmm/src/memory_manager.rs
View File

@ -166,10 +166,6 @@ pub enum Error {
/// Forbidden operation. Impossible to resize guest memory if it is /// Forbidden operation. Impossible to resize guest memory if it is
/// backed by user defined memory regions. /// backed by user defined memory regions.
InvalidResizeWithMemoryZones, InvalidResizeWithMemoryZones,
/// Forbidden operation. Impossible to restore guest memory if it is
/// backed by user defined memory regions.
InvalidRestoreWithMemoryZones,
} }
const ENABLE_FLAG: usize = 0; const ENABLE_FLAG: usize = 0;
@ -558,14 +554,6 @@ impl MemoryManager {
source_url: &str, source_url: &str,
prefault: bool, prefault: bool,
) -> Result<Arc<Mutex<MemoryManager>>, Error> { ) -> Result<Arc<Mutex<MemoryManager>>, Error> {
if config.size == 0 {
error!(
"Not allowed to restore guest memory when backed with user \
defined memory regions."
);
return Err(Error::InvalidRestoreWithMemoryZones);
}
let url = Url::parse(source_url).unwrap(); let url = Url::parse(source_url).unwrap();
/* url must be valid dir which is verified in recv_vm_snapshot() */ /* url must be valid dir which is verified in recv_vm_snapshot() */
let vm_snapshot_path = url.to_file_path().unwrap(); let vm_snapshot_path = url.to_file_path().unwrap();
@ -1534,13 +1522,6 @@ impl Snapshottable for MemoryManager {
} }
fn snapshot(&mut 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 \
defined memory regions."
)));
}
let mut memory_manager_snapshot = Snapshot::new(MEMORY_MANAGER_SNAPSHOT_ID); let mut memory_manager_snapshot = Snapshot::new(MEMORY_MANAGER_SNAPSHOT_ID);
let guest_memory = self.guest_memory.memory(); let guest_memory = self.guest_memory.memory();