Revert: "sandbox: remove network before stopping vm"

This reverts commit 794e08e. It breaks vfio device passthru as we need to bind the device back to host when removing the endpoint. And that is not possible when qemu is still running (thus holding reference to the device). Signed-off-by: Peng Tao <[email protected]>
kata-containers · Aug 15, 2019 · d26ff71 · d26ff71
1 parent 99e04ac
commit d26ff71
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
@@ -1473,16 +1473,16 @@ func (s *Sandbox) Stop(force bool) error {
 		}
 	}
 
-	// Remove the network.
-	if err := s.removeNetwork(); err != nil && !force {
+	if err := s.stopVM(); err != nil && !force {
 		return err
 	}
 
-	if err := s.stopVM(); err != nil && !force {
+	if err := s.setSandboxState(types.StateStopped); err != nil {
 		return err
 	}
 
-	if err := s.setSandboxState(types.StateStopped); err != nil {
+	// Remove the network.
+	if err := s.removeNetwork(); err != nil && !force {
 		return err
 	}