From 794e08e243a63947f063ac0c68be7d91db65aee3 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 6 Aug 2019 10:49:33 +0800 Subject: [PATCH] sandbox: remove network before stopping vm 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 --- virtcontainers/sandbox.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go index f8f744fd5a..7b8a79352c 100644 --- a/virtcontainers/sandbox.go +++ b/virtcontainers/sandbox.go @@ -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 { return err } @@ -1481,11 +1486,6 @@ func (s *Sandbox) Stop(force bool) error { return err } - // Remove the network. - if err := s.removeNetwork(); err != nil && !force { - return err - } - if err := s.storeSandbox(); err != nil { return err }