undo sending transport_reset event on snapshot creation

Signed-off-by: Amory Hoste <[email protected]>

src/vmm/src/device_manager/persist.rs

@@ -239,11 +239,12 @@ impl<'a> Persist<'a> for MMIODeviceManager {
 
                     // Send Transport event to reset connections if device
                     // is activated.
-                    if vsock.is_activated() {
+                    // TODO: temporarily disabled to avoid FC agent becoming unavailable when restoring snapshots
+                    /*if vsock.is_activated() {
                         vsock.send_transport_reset_event().unwrap_or_else(|e| {
                             error!("Failed to send reset transport event: {:?}", e);
                         });
-                    }
+                    }*/
 
                     states.vsock_device = Some(ConnectedVsockState {
                         device_id: devid.clone(),

src/vmm/src/persist.rs

@@ -425,7 +425,7 @@ pub fn restore_from_snapshot(
     if ! new_snapshot_path.eq("") {
         let n = microvm_state.device_states.block_devices.len();
         for i in 0..n {
-            if microvm_state.device_states.block_devices[i].device_state.disk_path.contains("fc-dev-thinpool-") {
+            if microvm_state.device_states.block_devices[i].device_state.disk_path.contains("thinpool-snap") {
                 microvm_state.device_states.block_devices[i].device_state.disk_path = new_snapshot_path.clone();
             }
         }

tools/devtool

@@ -72,8 +72,8 @@
 DEVCTR_IMAGE_NO_TAG="docker.io/amohoste/fcuvm_dev"
 
 # Development container tag
-#DEVCTR_IMAGE_TAG="v30"
-DEVCTR_IMAGE_TAG="v16_upf"
+DEVCTR_IMAGE_TAG="v30"
+#DEVCTR_IMAGE_TAG="v16_upf"
 
 # Development container image (name:tag)
 # This should be updated whenever we upgrade the development container.