From 90b5014a50104cae2e69c02bf6e2bedf7227cc81 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Mon, 28 Nov 2022 15:15:03 +0100 Subject: [PATCH] vmm: device_manager: Remove 'restoring' attribute Given 'restoring' isn't needed anymore from the DeviceManager structure, let's simplify it. Signed-off-by: Sebastien Boeuf --- vmm/src/device_manager.rs | 9 --------- vmm/src/vm.rs | 1 - 2 files changed, 10 deletions(-) diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 75f36720b..31d3dfc6a 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -931,9 +931,6 @@ pub struct DeviceManager { // Flag to force setting the iommu on virtio devices force_iommu: bool, - // Helps identify if the VM is currently being restored - restoring: bool, - // io_uring availability if detected io_uring_supported: Option, @@ -968,7 +965,6 @@ impl DeviceManager { numa_nodes: NumaNodes, activate_evt: &EventFd, force_iommu: bool, - restoring: bool, boot_id_list: BTreeSet, timestamp: Instant, snapshot: Option, @@ -1115,7 +1111,6 @@ impl DeviceManager { #[cfg(target_arch = "aarch64")] gpio_device: None, force_iommu, - restoring, io_uring_supported: None, boot_id_list, timestamp, @@ -4151,10 +4146,6 @@ impl DeviceManager { } } - // The devices have been fully restored, we can now update the - // restoring state of the DeviceManager. - self.restoring = false; - Ok(()) } diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index 215316bc2..c40802be6 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -564,7 +564,6 @@ impl Vm { numa_nodes.clone(), &activate_evt, force_iommu, - restoring, boot_id_list, timestamp, snapshot_from_id(snapshot, DEVICE_MANAGER_SNAPSHOT_ID),