fix(board): stop other VCPUs before returning errors

Signed-off-by: Changyuan Lyu <[email protected]>
google · Jan 13, 2025 · c015432 · c015432
1 parent db11aab
commit c015432
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/alioth/src/board/board.rs b/alioth/src/board/board.rs
@@ -341,12 +341,12 @@ where
             self.sync_vcpus(&vcpus)?;
             drop(vcpus);
 
-            let reboot = self.vcpu_loop(vcpu, id)?;
+            let maybe_reboot = self.vcpu_loop(vcpu, id);
 
             let vcpus = self.vcpus.read();
             let mut mp_sync = self.mp_sync.lock();
             if mp_sync.state == BoardState::Running {
-                mp_sync.state = if reboot {
+                mp_sync.state = if !matches!(maybe_reboot, Ok(true)) {
                     BoardState::RebootPending
                 } else {
                     BoardState::Shutdown
@@ -359,6 +359,11 @@ where
                     }
                 }
             }
+
+            if let Err(e) = maybe_reboot {
+                break Err(e);
+            }
+
             self.sync_vcpus(&vcpus)?;
 
             if id == 0 {