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

Merge pull request #1959 from bergwolf/stopvm

Browse Source 
qemu: do not try to stop qemu multiple times
This commit is contained in:
Julio Montes 2019-08-15 08:50:17 -05:00 committed by GitHub
commit de4582eda3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
virtcontainers/qemu.go
View File

@ -93,6 +93,8 @@ type qemu struct {
ctx context.Context ctx context.Context
nvdimmCount int nvdimmCount int
stopped bool
} }
const ( const (
@ -835,8 +837,16 @@ func (q *qemu) stopSandbox() error {
span, _ := q.trace("stopSandbox") span, _ := q.trace("stopSandbox")
defer span.Finish() defer span.Finish()
defer q.cleanupVM()
q.Logger().Info("Stopping Sandbox") q.Logger().Info("Stopping Sandbox")
if q.stopped {
q.Logger().Info("Already stopped")
return nil
}
defer func() {
q.cleanupVM()
q.stopped = true
}()
err := q.qmpSetup() err := q.qmpSetup()
if err != nil { if err != nil {