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: Merge Vm::new_from_snapshot with Vm::new

Browse Source 
Given the recent factorization that happened in vm.rs, we're now able to
merge Vm::new_from_snapshot with Vm::new.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2022-12-01 11:13:08 +01:00
parent 1c36065754
commit e8c6d83f3f
2 changed files with 48 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/lib.rs
+13 -4
View File
@@ -584,6 +584,9 @@ impl Vmm {
None,
None,
None,
None,
None,
None,
)?;
self.vm = Some(vm);
@@ -667,18 +670,21 @@ impl Vmm {
.try_clone()
.map_err(VmError::EventFdClone)?;
let vm = Vm::new_from_snapshot(
&snapshot,
let vm = Vm::new(
vm_config,
exit_evt,
reset_evt,
#[cfg(feature = "guest_debug")]
debug_evt,
Some(source_url),
restore_cfg.prefault,
&self.seccomp_action,
self.hypervisor.clone(),
activate_evt,
None,
None,
None,
Some(snapshot.clone()),
Some(source_url),
Some(restore_cfg.prefault),
)?;
self.vm = Some(vm);
@@ -756,6 +762,9 @@ impl Vmm {
serial_pty,
console_pty,
console_resize_pipe,
None,
None,
None,
)?;
// And we boot it