github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 08:47:56 +00:00
Code Issues Projects Releases Wiki Activity

sandbox: remove network before stopping vm

Browse Source 
We might need to call hypervisor hotunplug to really remove
a network device. We cannot do it after stopping the VM.

Fixes: #1956
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Peng Tao 2019-08-06 10:49:33 +08:00
parent 9ea469bcfa
commit 794e08e243
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtcontainers/sandbox.go
View File

@ -1473,6 +1473,11 @@ func (s *Sandbox) Stop(force bool) error {
} }
} }
// Remove the network.
if err := s.removeNetwork(); err != nil && !force {
return err
}
if err := s.stopVM(); err != nil && !force { if err := s.stopVM(); err != nil && !force {
return err return err
} }
@ -1481,11 +1486,6 @@ func (s *Sandbox) Stop(force bool) error {
return err return err
} }
// Remove the network.
if err := s.removeNetwork(); err != nil && !force {
return err
}
if err := s.storeSandbox(); err != nil { if err := s.storeSandbox(); err != nil {
return err return err
} }