From 2e01bf7f744c4048e5066b4c2c5a5576f53de08b Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Thu, 1 Dec 2022 17:00:24 +0100 Subject: [PATCH] vmm: Provide an owned Snapshot rather than a reference Signed-off-by: Sebastien Boeuf --- vmm/src/lib.rs | 2 +- vmm/src/vm.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs index 13417012c..6376ffff1 100644 --- a/vmm/src/lib.rs +++ b/vmm/src/lib.rs @@ -1264,7 +1264,7 @@ impl Vmm { None, None, None, - Some(&snapshot), + Some(snapshot), ) .map_err(|e| { MigratableError::MigrateReceive(anyhow!("Error creating VM from snapshot: {:?}", e)) diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index 1faec97da..63f66bd7f 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -479,7 +479,7 @@ impl Vm { serial_pty: Option, console_pty: Option, console_resize_pipe: Option, - snapshot: Option<&Snapshot>, + snapshot: Option, ) -> Result { trace_scoped!("Vm::new_from_memory_manager"); @@ -546,7 +546,7 @@ impl Vm { cpu_manager .lock() .unwrap() - .create_boot_vcpus(snapshot_from_id(snapshot, CPU_MANAGER_SNAPSHOT_ID)) + .create_boot_vcpus(snapshot_from_id(snapshot.as_ref(), CPU_MANAGER_SNAPSHOT_ID)) .map_err(Error::CpuManager)?; #[cfg(feature = "tdx")] @@ -571,7 +571,7 @@ impl Vm { force_iommu, boot_id_list, timestamp, - snapshot_from_id(snapshot, DEVICE_MANAGER_SNAPSHOT_ID), + snapshot_from_id(snapshot.as_ref(), DEVICE_MANAGER_SNAPSHOT_ID), dynamic, ) .map_err(Error::DeviceManager)?; @@ -799,7 +799,7 @@ impl Vm { serial_pty, console_pty, console_resize_pipe, - snapshot.as_ref(), + snapshot, ) }