actual-use

Author: phip1611

vmm/src/lib.rs

@@ -282,7 +282,7 @@ impl From<u64> for EpollDispatch {
 }
 
 // TODO make this a member of Vmm?
-static MIGRATION_PROGRESS_SNAPSHOT: Mutex<Option<MigrationProgressAndStatus>> = Mutex::new(None);
+static MIGRATION_PROGRESS_SNAPSHOT: Mutex<Option<MigrationProgress>> = Mutex::new(None);
 
 enum SocketStream {
     Unix(UnixStream),
@@ -2115,7 +2115,7 @@ impl Vmm {
                 lock.as_mut()
                     .expect("live migration should be ongoing")
                     .update_ongoing_migration_state(
-                        MigrationPhase::MemoryPrecopy,
+                        OngoingMigrationPhase::MemoryPrecopy,
                         Some(MemoryTransmissionInfo {
                             memory_iteration: s.iteration,
                             memory_transmission_bps: s.mb_per_sec as u64 * 1024 * 1024,
@@ -2248,13 +2248,13 @@ impl Vmm {
             let mut lock = MIGRATION_PROGRESS_SNAPSHOT.lock().unwrap();
             if let Some(snapshot) = lock.as_ref() {
                 match snapshot.state {
-                    MigrationProgressState::Ongoing { .. } => {
+                    MigrationState::Ongoing { .. } => {
                         // if this fails, we made a programming error in our state handling
                         panic!("migration already ongoing");
                     }
-                    MigrationProgressState::Cancelled { .. } => {}
-                    MigrationProgressState::Failed { .. } => {}
-                    MigrationProgressState::Finished { .. } => {}
+                    MigrationState::Cancelled { .. } => {}
+                    MigrationState::Failed { .. } => {}
+                    MigrationState::Finished { .. } => {}
                 }
             }
             let transportation_mode = if send_data_migration.local {
@@ -2265,7 +2265,7 @@ impl Vmm {
                     tls: send_data_migration.tls_dir.is_some(),
                 }
             };
-            lock.replace(MigrationProgressAndStatus::new(
+            lock.replace(MigrationProgress::new(
                 transportation_mode,
                 Duration::from_millis(send_data_migration.downtime),
             ));
@@ -2318,7 +2318,11 @@ impl Vmm {
                     let mut lock = MIGRATION_PROGRESS_SNAPSHOT.lock().unwrap();
                     lock.as_mut()
                         .expect("live migration should be ongoing")
-                        .update_ongoing_migration_state(MigrationPhase::MemoryFds, None, None);
+                        .update_ongoing_migration_state(
+                            OngoingMigrationPhase::MemoryFds,
+                            None,
+                            None,
+                        );
 
                     // Proceed with sending memory file descriptors over UNIX socket
                     vm.send_memory_fds(unix_socket)?;
@@ -2366,7 +2370,7 @@ impl Vmm {
                 let mut lock = MIGRATION_PROGRESS_SNAPSHOT.lock().unwrap();
                 lock.as_mut()
                     .expect("live migration should be ongoing")
-                    .update_ongoing_migration_state(MigrationPhase::Completing, None, None);
+                    .update_ongoing_migration_state(OngoingMigrationPhase::Completing, None, None);
             }
         }
 
@@ -3571,7 +3575,7 @@ impl RequestHandler for Vmm {
         Ok(())
     }
 
-    fn vm_migration_progress(&mut self) -> Option<MigrationProgressAndStatus> {
+    fn vm_migration_progress(&mut self) -> Option<MigrationProgress> {
         let lock = MIGRATION_PROGRESS_SNAPSHOT.lock().unwrap();
         lock.clone()
     }