From e475b12cf79b3c743e7d562d632062a00b496e26 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Fri, 3 Sep 2021 10:30:06 +0100 Subject: [PATCH] virtio-devices, vmm: Upgrade restore related messages to info!() These happen only sporadically so can be included at the info!() level. Signed-off-by: Rob Bradford --- virtio-devices/src/device.rs | 4 ++-- virtio-devices/src/epoll_helper.rs | 4 ++-- vmm/src/cpu.rs | 2 +- vmm/src/device_manager.rs | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/virtio-devices/src/device.rs b/virtio-devices/src/device.rs index 61d12ed45..d761d1bac 100644 --- a/virtio-devices/src/device.rs +++ b/virtio-devices/src/device.rs @@ -331,7 +331,7 @@ impl VirtioCommon { impl Pausable for VirtioCommon { fn pause(&mut self) -> std::result::Result<(), MigratableError> { - debug!( + info!( "Pausing virtio-{}", VirtioDeviceType::from(self.device_type) ); @@ -353,7 +353,7 @@ impl Pausable for VirtioCommon { } fn resume(&mut self) -> std::result::Result<(), MigratableError> { - debug!( + info!( "Resuming virtio-{}", VirtioDeviceType::from(self.device_type) ); diff --git a/virtio-devices/src/epoll_helper.rs b/virtio-devices/src/epoll_helper.rs index 21216c283..4cfcf924f 100644 --- a/virtio-devices/src/epoll_helper.rs +++ b/virtio-devices/src/epoll_helper.rs @@ -131,11 +131,11 @@ impl EpollHelper { match ev_type { EPOLL_HELPER_EVENT_KILL => { - debug!("KILL_EVENT received, stopping epoll loop"); + info!("KILL_EVENT received, stopping epoll loop"); return Ok(()); } EPOLL_HELPER_EVENT_PAUSE => { - debug!("PAUSE_EVENT received, pausing epoll loop"); + info!("PAUSE_EVENT received, pausing epoll loop"); // Acknowledge the pause is effective by using the // paused_sync barrier. diff --git a/vmm/src/cpu.rs b/vmm/src/cpu.rs index 8f5b31dbc..4378dd573 100644 --- a/vmm/src/cpu.rs +++ b/vmm/src/cpu.rs @@ -1605,7 +1605,7 @@ impl Snapshottable for CpuManager { fn restore(&mut self, snapshot: Snapshot) -> std::result::Result<(), MigratableError> { for (cpu_id, snapshot) in snapshot.snapshots.iter() { - debug!("Restoring VCPU {}", cpu_id); + info!("Restoring VCPU {}", cpu_id); self.create_vcpu(cpu_id.parse::().unwrap(), None, Some(*snapshot.clone())) .map_err(|e| MigratableError::Restore(anyhow!("Could not create vCPU {:?}", e)))?; } diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 26dc1edca..28c79ca13 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -2195,7 +2195,7 @@ impl DeviceManager { // Look for the id in the device tree. If it can be found, that means // the device is being restored, otherwise it's created from scratch. let cache_range = if let Some(node) = self.device_tree.lock().unwrap().get(&id) { - debug!("Restoring virtio-fs {} resources", id); + info!("Restoring virtio-fs {} resources", id); let mut cache_range: Option<(u64, u64)> = None; for resource in node.resources.iter() { @@ -2352,7 +2352,7 @@ impl DeviceManager { // Look for the id in the device tree. If it can be found, that means // the device is being restored, otherwise it's created from scratch. let region_range = if let Some(node) = self.device_tree.lock().unwrap().get(&id) { - debug!("Restoring virtio-pmem {} resources", id); + info!("Restoring virtio-pmem {} resources", id); let mut region_range: Option<(u64, u64)> = None; for resource in node.resources.iter() { @@ -3074,7 +3074,7 @@ impl DeviceManager { // the device is being restored, otherwise it's created from scratch. let (pci_device_bdf, config_bar_addr) = if let Some(node) = self.device_tree.lock().unwrap().get(&id) { - debug!("Restoring virtio-pci {} resources", id); + info!("Restoring virtio-pci {} resources", id); let pci_device_bdf = node .pci_bdf .ok_or(DeviceManagerError::MissingDeviceNodePciBdf)?; @@ -3667,7 +3667,7 @@ impl DeviceManager { { // Restore the node if let Some(migratable) = &node.migratable { - debug!("Restoring {} from DeviceManager", node.id); + info!("Restoring {} from DeviceManager", node.id); if let Some(snapshot) = snapshot.snapshots.get(&node.id) { migratable.lock().unwrap().pause()?; migratable.lock().unwrap().restore(*snapshot.clone())?;